diff --git a/src/Debug/EcsDebug.cs b/src/DebugUtils/EcsDebug.cs
similarity index 99%
rename from src/Debug/EcsDebug.cs
rename to src/DebugUtils/EcsDebug.cs
index 6493c99..e2f6404 100644
--- a/src/Debug/EcsDebug.cs
+++ b/src/DebugUtils/EcsDebug.cs
@@ -57,7 +57,6 @@ namespace DCFApixels.DragonECS
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void PrintWarning(object v)
         {
-
 #if (DEBUG && !DISABLE_DEBUG) || ENABLE_DRAGONECS_DEBUGGER
             DebugService.Instance.PrintWarning(v);
 #endif
diff --git a/src/Debug/EcsDebug.cs.meta b/src/DebugUtils/EcsDebug.cs.meta
similarity index 100%
rename from src/Debug/EcsDebug.cs.meta
rename to src/DebugUtils/EcsDebug.cs.meta
diff --git a/src/Debug/EcsDebugUtility.cs b/src/DebugUtils/EcsDebugUtility.cs
similarity index 100%
rename from src/Debug/EcsDebugUtility.cs
rename to src/DebugUtils/EcsDebugUtility.cs
diff --git a/src/Debug/EcsDebugUtility.cs.meta b/src/DebugUtils/EcsDebugUtility.cs.meta
similarity index 100%
rename from src/Debug/EcsDebugUtility.cs.meta
rename to src/DebugUtils/EcsDebugUtility.cs.meta
diff --git a/src/Debug/Interfaces.meta b/src/DebugUtils/Interfaces.meta
similarity index 100%
rename from src/Debug/Interfaces.meta
rename to src/DebugUtils/Interfaces.meta
diff --git a/src/Debug/Interfaces/IEcsTypeMetaProvider.cs b/src/DebugUtils/Interfaces/IEcsTypeMetaProvider.cs
similarity index 100%
rename from src/Debug/Interfaces/IEcsTypeMetaProvider.cs
rename to src/DebugUtils/Interfaces/IEcsTypeMetaProvider.cs
diff --git a/src/Debug/Interfaces/IEcsTypeMetaProvider.cs.meta b/src/DebugUtils/Interfaces/IEcsTypeMetaProvider.cs.meta
similarity index 100%
rename from src/Debug/Interfaces/IEcsTypeMetaProvider.cs.meta
rename to src/DebugUtils/Interfaces/IEcsTypeMetaProvider.cs.meta
diff --git a/src/Debug/MetaAttributes.meta b/src/DebugUtils/MetaAttributes.meta
similarity index 100%
rename from src/Debug/MetaAttributes.meta
rename to src/DebugUtils/MetaAttributes.meta
diff --git a/src/Debug/MetaAttributes/EcsMetaAttribute.cs b/src/DebugUtils/MetaAttributes/EcsMetaAttribute.cs
similarity index 100%
rename from src/Debug/MetaAttributes/EcsMetaAttribute.cs
rename to src/DebugUtils/MetaAttributes/EcsMetaAttribute.cs
diff --git a/src/Debug/MetaAttributes/EcsMetaAttribute.cs.meta b/src/DebugUtils/MetaAttributes/EcsMetaAttribute.cs.meta
similarity index 100%
rename from src/Debug/MetaAttributes/EcsMetaAttribute.cs.meta
rename to src/DebugUtils/MetaAttributes/EcsMetaAttribute.cs.meta
diff --git a/src/Debug/MetaAttributes/MetaColorAttribute.cs b/src/DebugUtils/MetaAttributes/MetaColorAttribute.cs
similarity index 100%
rename from src/Debug/MetaAttributes/MetaColorAttribute.cs
rename to src/DebugUtils/MetaAttributes/MetaColorAttribute.cs
diff --git a/src/Debug/MetaAttributes/MetaColorAttribute.cs.meta b/src/DebugUtils/MetaAttributes/MetaColorAttribute.cs.meta
similarity index 100%
rename from src/Debug/MetaAttributes/MetaColorAttribute.cs.meta
rename to src/DebugUtils/MetaAttributes/MetaColorAttribute.cs.meta
diff --git a/src/Debug/MetaAttributes/MetaDescriptionAttribute.cs b/src/DebugUtils/MetaAttributes/MetaDescriptionAttribute.cs
similarity index 100%
rename from src/Debug/MetaAttributes/MetaDescriptionAttribute.cs
rename to src/DebugUtils/MetaAttributes/MetaDescriptionAttribute.cs
diff --git a/src/Debug/MetaAttributes/MetaDescriptionAttribute.cs.meta b/src/DebugUtils/MetaAttributes/MetaDescriptionAttribute.cs.meta
similarity index 100%
rename from src/Debug/MetaAttributes/MetaDescriptionAttribute.cs.meta
rename to src/DebugUtils/MetaAttributes/MetaDescriptionAttribute.cs.meta
diff --git a/src/Debug/MetaAttributes/MetaGroupAttribute.cs b/src/DebugUtils/MetaAttributes/MetaGroupAttribute.cs
similarity index 100%
rename from src/Debug/MetaAttributes/MetaGroupAttribute.cs
rename to src/DebugUtils/MetaAttributes/MetaGroupAttribute.cs
diff --git a/src/Debug/MetaAttributes/MetaGroupAttribute.cs.meta b/src/DebugUtils/MetaAttributes/MetaGroupAttribute.cs.meta
similarity index 100%
rename from src/Debug/MetaAttributes/MetaGroupAttribute.cs.meta
rename to src/DebugUtils/MetaAttributes/MetaGroupAttribute.cs.meta
diff --git a/src/Debug/MetaAttributes/MetaNameAttribute.cs b/src/DebugUtils/MetaAttributes/MetaNameAttribute.cs
similarity index 100%
rename from src/Debug/MetaAttributes/MetaNameAttribute.cs
rename to src/DebugUtils/MetaAttributes/MetaNameAttribute.cs
diff --git a/src/Debug/MetaAttributes/MetaNameAttribute.cs.meta b/src/DebugUtils/MetaAttributes/MetaNameAttribute.cs.meta
similarity index 100%
rename from src/Debug/MetaAttributes/MetaNameAttribute.cs.meta
rename to src/DebugUtils/MetaAttributes/MetaNameAttribute.cs.meta
diff --git a/src/Debug/MetaAttributes/MetaTagsAttribute.cs b/src/DebugUtils/MetaAttributes/MetaTagsAttribute.cs
similarity index 100%
rename from src/Debug/MetaAttributes/MetaTagsAttribute.cs
rename to src/DebugUtils/MetaAttributes/MetaTagsAttribute.cs
diff --git a/src/Debug/MetaAttributes/MetaTagsAttribute.cs.meta b/src/DebugUtils/MetaAttributes/MetaTagsAttribute.cs.meta
similarity index 100%
rename from src/Debug/MetaAttributes/MetaTagsAttribute.cs.meta
rename to src/DebugUtils/MetaAttributes/MetaTagsAttribute.cs.meta
diff --git a/src/Debug/TypeMeta.cs b/src/DebugUtils/TypeMeta.cs
similarity index 100%
rename from src/Debug/TypeMeta.cs
rename to src/DebugUtils/TypeMeta.cs
diff --git a/src/Debug/TypeMeta.cs.meta b/src/DebugUtils/TypeMeta.cs.meta
similarity index 100%
rename from src/Debug/TypeMeta.cs.meta
rename to src/DebugUtils/TypeMeta.cs.meta