diff --git a/src/Builtin/BaseProcesses.cs b/src/Builtin/BaseProcesses.cs
index 52344b5..3a25389 100644
--- a/src/Builtin/BaseProcesses.cs
+++ b/src/Builtin/BaseProcesses.cs
@@ -51,7 +51,7 @@ namespace DCFApixels.DragonECS
     }
 }
 
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
 #if ENABLE_IL2CPP
     using Unity.IL2CPP.CompilerServices;
diff --git a/src/Collections/EcsGroup.cs b/src/Collections/EcsGroup.cs
index 7c311f0..df0eeb4 100644
--- a/src/Collections/EcsGroup.cs
+++ b/src/Collections/EcsGroup.cs
@@ -3,7 +3,6 @@
 #endif
 using DCFApixels.DragonECS.Core.Internal;
 using DCFApixels.DragonECS.Core.Unchecked;
-using DCFApixels.DragonECS.Internal;
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/src/Collections/EcsSpan.cs b/src/Collections/EcsSpan.cs
index 11161e6..86a0ce2 100644
--- a/src/Collections/EcsSpan.cs
+++ b/src/Collections/EcsSpan.cs
@@ -1,8 +1,8 @@
 #if DISABLE_DEBUG
 #undef DEBUG
 #endif
+using DCFApixels.DragonECS.Core.Internal;
 using DCFApixels.DragonECS.Core.Unchecked;
-using DCFApixels.DragonECS.Internal;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
diff --git a/src/DebugUtils/EcsDebug.cs b/src/DebugUtils/EcsDebug.cs
index c8b6c4d..bdbb4a6 100644
--- a/src/DebugUtils/EcsDebug.cs
+++ b/src/DebugUtils/EcsDebug.cs
@@ -2,7 +2,7 @@
 #undef DEBUG
 #endif
 using DCFApixels.DragonECS.Core;
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/src/DebugUtils/EcsDebugUtility.cs b/src/DebugUtils/EcsDebugUtility.cs
index f7303dd..6a0f794 100644
--- a/src/DebugUtils/EcsDebugUtility.cs
+++ b/src/DebugUtils/EcsDebugUtility.cs
@@ -1,7 +1,7 @@
 #if DISABLE_DEBUG
 #undef DEBUG
 #endif
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using System;
 using System.Collections.Generic;
 #if DEBUG || !REFLECTION_DISABLED
diff --git a/src/DebugUtils/MetaAttributes/MetaColorAttribute.cs b/src/DebugUtils/MetaAttributes/MetaColorAttribute.cs
index 7d5e930..6b8bc10 100644
--- a/src/DebugUtils/MetaAttributes/MetaColorAttribute.cs
+++ b/src/DebugUtils/MetaAttributes/MetaColorAttribute.cs
@@ -2,7 +2,7 @@
 #undef DEBUG
 #endif
 using DCFApixels.DragonECS.Core;
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using System;
 using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
diff --git a/src/DebugUtils/MetaAttributes/MetaIDAttribute.cs b/src/DebugUtils/MetaAttributes/MetaIDAttribute.cs
index 2cd1e73..2b4d3ab 100644
--- a/src/DebugUtils/MetaAttributes/MetaIDAttribute.cs
+++ b/src/DebugUtils/MetaAttributes/MetaIDAttribute.cs
@@ -3,7 +3,6 @@
 #endif
 using DCFApixels.DragonECS.Core;
 using DCFApixels.DragonECS.Core.Internal;
-using DCFApixels.DragonECS.Internal;
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/src/DebugUtils/TypeMeta.cs b/src/DebugUtils/TypeMeta.cs
index 8eceb19..7c3d8c9 100644
--- a/src/DebugUtils/TypeMeta.cs
+++ b/src/DebugUtils/TypeMeta.cs
@@ -2,7 +2,7 @@
 #undef DEBUG
 #endif
 using DCFApixels.DragonECS.Core;
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using DCFApixels.DragonECS.PoolsCore;
 using System;
 using System.Collections.Generic;
diff --git a/src/EcsAspect.cs b/src/EcsAspect.cs
index bd4f5d5..b2e69c8 100644
--- a/src/EcsAspect.cs
+++ b/src/EcsAspect.cs
@@ -2,7 +2,7 @@
 #undef DEBUG
 #endif
 using DCFApixels.DragonECS.Core;
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using DCFApixels.DragonECS.PoolsCore;
 using System;
 using System.Collections.Generic;
diff --git a/src/EcsMask.cs b/src/EcsMask.cs
index 6afb948..761f007 100644
--- a/src/EcsMask.cs
+++ b/src/EcsMask.cs
@@ -3,7 +3,6 @@
 #endif
 using DCFApixels.DragonECS.Core;
 using DCFApixels.DragonECS.Core.Internal;
-using DCFApixels.DragonECS.Internal;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -961,7 +960,7 @@ namespace DCFApixels.DragonECS
     #endregion
 }
 
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
     #region EcsMaskIteratorUtility
 #if ENABLE_IL2CPP
diff --git a/src/EcsPipeline.Builder.cs b/src/EcsPipeline.Builder.cs
index 8a6872e..fec1c9a 100644
--- a/src/EcsPipeline.Builder.cs
+++ b/src/EcsPipeline.Builder.cs
@@ -2,7 +2,7 @@
 #undef DEBUG
 #endif
 using DCFApixels.DragonECS.Core;
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using DCFApixels.DragonECS.RunnersCore;
 using System;
 using System.Collections.Generic;
diff --git a/src/EcsPipeline.cs b/src/EcsPipeline.cs
index 43b0a36..cb73cbc 100644
--- a/src/EcsPipeline.cs
+++ b/src/EcsPipeline.cs
@@ -1,7 +1,7 @@
 #if DISABLE_DEBUG
 #undef DEBUG
 #endif
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using DCFApixels.DragonECS.RunnersCore;
 using System;
 using System.Collections;
diff --git a/src/EcsRunner.cs b/src/EcsRunner.cs
index 227a53a..23bf070 100644
--- a/src/EcsRunner.cs
+++ b/src/EcsRunner.cs
@@ -1,7 +1,7 @@
 #if DISABLE_DEBUG
 #undef DEBUG
 #endif
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using DCFApixels.DragonECS.RunnersCore;
 using System;
 using System.Linq;
diff --git a/src/EcsStaticMask.cs b/src/EcsStaticMask.cs
index b07197d..90062f5 100644
--- a/src/EcsStaticMask.cs
+++ b/src/EcsStaticMask.cs
@@ -2,7 +2,7 @@
 #undef DEBUG
 #endif
 using DCFApixels.DragonECS.Core;
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
diff --git a/src/EcsWorld.cs b/src/EcsWorld.cs
index a06ded2..4dd7d79 100644
--- a/src/EcsWorld.cs
+++ b/src/EcsWorld.cs
@@ -2,8 +2,8 @@
 #undef DEBUG
 #endif
 using DCFApixels.DragonECS.Core;
+using DCFApixels.DragonECS.Core.Internal;
 using DCFApixels.DragonECS.Core.Unchecked;
-using DCFApixels.DragonECS.Internal;
 using DCFApixels.DragonECS.PoolsCore;
 using System;
 using System.Collections.Generic;
diff --git a/src/EcsWorld.pools.cs b/src/EcsWorld.pools.cs
index 404bc3f..51edda5 100644
--- a/src/EcsWorld.pools.cs
+++ b/src/EcsWorld.pools.cs
@@ -1,7 +1,7 @@
 #if DISABLE_DEBUG
 #undef DEBUG
 #endif
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using DCFApixels.DragonECS.PoolsCore;
 using System;
 using System.Linq;
diff --git a/src/EcsWorld.static.cs b/src/EcsWorld.static.cs
index 2d6b980..d7b0ee9 100644
--- a/src/EcsWorld.static.cs
+++ b/src/EcsWorld.static.cs
@@ -2,7 +2,7 @@
 #undef DEBUG
 #endif
 using DCFApixels.DragonECS.Core;
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
diff --git a/src/Executors/EcsWhereExecutor.cs b/src/Executors/EcsWhereExecutor.cs
index d439441..9b94458 100644
--- a/src/Executors/EcsWhereExecutor.cs
+++ b/src/Executors/EcsWhereExecutor.cs
@@ -1,14 +1,13 @@
 #if DISABLE_DEBUG
 #undef DEBUG
 #endif
-using DCFApixels.DragonECS.Core;
 using System;
 using System.Runtime.CompilerServices;
 #if ENABLE_IL2CPP
 using Unity.IL2CPP.CompilerServices;
 #endif
 
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
 #if ENABLE_IL2CPP
     [Il2CppSetOption(Option.NullChecks, false)]
diff --git a/src/Executors/EcsWhereToGroupExecutor.cs b/src/Executors/EcsWhereToGroupExecutor.cs
index ed6b6b6..aea581b 100644
--- a/src/Executors/EcsWhereToGroupExecutor.cs
+++ b/src/Executors/EcsWhereToGroupExecutor.cs
@@ -1,13 +1,12 @@
 #if DISABLE_DEBUG
 #undef DEBUG
 #endif
-using DCFApixels.DragonECS.Core;
 using System.Runtime.CompilerServices;
 #if ENABLE_IL2CPP
 using Unity.IL2CPP.CompilerServices;
 #endif
 
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
 #if ENABLE_IL2CPP
     [Il2CppSetOption(Option.NullChecks, false)]
diff --git a/src/Executors/MaskQueryExecutor.cs b/src/Executors/MaskQueryExecutor.cs
index c7c53c4..17144fb 100644
--- a/src/Executors/MaskQueryExecutor.cs
+++ b/src/Executors/MaskQueryExecutor.cs
@@ -2,7 +2,7 @@
 #undef DEBUG
 #endif
 using DCFApixels.DragonECS.Core;
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
diff --git a/src/Executors/Queries.cs b/src/Executors/Queries.cs
index 0335890..30c9644 100644
--- a/src/Executors/Queries.cs
+++ b/src/Executors/Queries.cs
@@ -2,7 +2,7 @@
 #undef DEBUG
 #endif
 using DCFApixels.DragonECS.Core;
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using System;
 
 namespace DCFApixels.DragonECS
diff --git a/src/Injections/EcsPipelineExtensions.cs b/src/Injections/EcsPipelineExtensions.cs
index 53a2cbf..95a9fad 100644
--- a/src/Injections/EcsPipelineExtensions.cs
+++ b/src/Injections/EcsPipelineExtensions.cs
@@ -1,7 +1,7 @@
 #if DISABLE_DEBUG
 #undef DEBUG
 #endif
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 
 namespace DCFApixels.DragonECS
 {
diff --git a/src/Injections/Graph/InjectionBranch.cs b/src/Injections/Graph/InjectionBranch.cs
index 17708ac..eaf1a29 100644
--- a/src/Injections/Graph/InjectionBranch.cs
+++ b/src/Injections/Graph/InjectionBranch.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
     internal class InjectionBranch
     {
diff --git a/src/Injections/Graph/InjectionNode.cs b/src/Injections/Graph/InjectionNode.cs
index 54bed3e..a933d1b 100644
--- a/src/Injections/Graph/InjectionNode.cs
+++ b/src/Injections/Graph/InjectionNode.cs
@@ -17,7 +17,7 @@ namespace DCFApixels.DragonECS
         public abstract void Init(EcsPipeline pipeline);
     }
 }
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
     internal sealed class InjectionNode<T> : InjectionNodeBase
     {
diff --git a/src/Injections/Injector.cs b/src/Injections/Injector.cs
index 7d3958f..a722962 100644
--- a/src/Injections/Injector.cs
+++ b/src/Injections/Injector.cs
@@ -1,7 +1,7 @@
 #if DISABLE_DEBUG
 #undef DEBUG
 #endif
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/Internal/Allocators/MemoryAllocator.cs b/src/Internal/Allocators/MemoryAllocator.cs
index 2ff65ff..1ff4883 100644
--- a/src/Internal/Allocators/MemoryAllocator.cs
+++ b/src/Internal/Allocators/MemoryAllocator.cs
@@ -1,7 +1,6 @@
 #if DISABLE_DEBUG
 #undef DEBUG
 #endif
-using DCFApixels.DragonECS.Internal;
 using System;
 using System.Runtime.InteropServices;
 
@@ -213,18 +212,18 @@ namespace DCFApixels.DragonECS.Core.Internal
             public static Handler FromHandledPtr(void* ptr) { return new Handler(((Meta*)ptr) + 1); }
             public static Handler FromDataPtr(void* ptr) { return new Handler((Meta*)ptr); }
             internal Meta* GetHandledPtr() { return Data - 1; }
-            internal int GetID_Debug() 
+            internal int GetID_Debug()
             {
 #if DEBUG
-                return GetHandledPtr()->ID; 
+                return GetHandledPtr()->ID;
 #else
                 return 0;
 #endif
             }
-            internal int GetByteLength_Debug() 
+            internal int GetByteLength_Debug()
             {
 #if DEBUG
-                return GetHandledPtr()->ByteLength; 
+                return GetHandledPtr()->ByteLength;
 #else
                 return 0;
 #endif
@@ -241,7 +240,7 @@ namespace DCFApixels.DragonECS.Core.Internal
 #pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
             internal unsafe string DebuggerDisplay()
             {
-                if(Data == null)
+                if (Data == null)
                 {
                     return "-";
                 }
@@ -328,9 +327,9 @@ namespace DCFApixels.DragonECS.Core.Internal
 
     internal static class MemoryAllocatorHandlerExtensions
     {
-        public static void Dispose(this ref MemoryAllocator.Handler self) 
+        public static void Dispose(this ref MemoryAllocator.Handler self)
         {
-            MemoryAllocator.Free(ref self); 
+            MemoryAllocator.Free(ref self);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Internal/ArraySortHalperX.cs b/src/Internal/ArraySortHalperX.cs
index 4b80ddc..293007d 100644
--- a/src/Internal/ArraySortHalperX.cs
+++ b/src/Internal/ArraySortHalperX.cs
@@ -8,7 +8,7 @@ using System.Runtime.CompilerServices;
 using Unity.IL2CPP.CompilerServices;
 #endif
 
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
     internal interface IStructComparer<T> : IComparer<T>
     {
diff --git a/src/Internal/ArrayUtility.cs b/src/Internal/ArrayUtility.cs
index a0cfa68..b1b8149 100644
--- a/src/Internal/ArrayUtility.cs
+++ b/src/Internal/ArrayUtility.cs
@@ -1,7 +1,6 @@
 #if DISABLE_DEBUG
 #undef DEBUG
 #endif
-using DCFApixels.DragonECS.Core.Internal;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -9,7 +8,7 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
     internal interface ILinkedNext
     {
diff --git a/src/Internal/BitsUtility.cs b/src/Internal/BitsUtility.cs
index c79115e..af2ad8a 100644
--- a/src/Internal/BitsUtility.cs
+++ b/src/Internal/BitsUtility.cs
@@ -6,10 +6,10 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
-using static DCFApixels.DragonECS.Internal.BitsUtility;
 
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
+    using static BitsUtility;
     internal unsafe static class BitsUtility
     {
         private const char DEFAULT_SEPARATOR = '_';
diff --git a/src/Internal/EcsTypeCodeManager.cs b/src/Internal/EcsTypeCodeManager.cs
index 1bafb05..265115a 100644
--- a/src/Internal/EcsTypeCodeManager.cs
+++ b/src/Internal/EcsTypeCodeManager.cs
@@ -10,7 +10,7 @@ using System.Runtime.CompilerServices;
 using Unity.IL2CPP.CompilerServices;
 #endif
 
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
     //TODO разработать возможность ручного устанавливания ID типам.
     //это может быть полезно как детерминированность для сети
diff --git a/src/Internal/IdDispenser.cs b/src/Internal/IdDispenser.cs
index c4661bf..97ae478 100644
--- a/src/Internal/IdDispenser.cs
+++ b/src/Internal/IdDispenser.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
 #if ENABLE_IL2CPP
     using Unity.IL2CPP.CompilerServices;
diff --git a/src/Internal/ReflectionUtility.cs b/src/Internal/ReflectionUtility.cs
index 1aab8d2..46ed351 100644
--- a/src/Internal/ReflectionUtility.cs
+++ b/src/Internal/ReflectionUtility.cs
@@ -5,7 +5,7 @@ using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
     internal static class ReflectionUtility
     {
diff --git a/src/Internal/SparseArray.cs b/src/Internal/SparseArray.cs
index 30a0c01..664e182 100644
--- a/src/Internal/SparseArray.cs
+++ b/src/Internal/SparseArray.cs
@@ -9,7 +9,7 @@ using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
 #if ENABLE_IL2CPP
     using Unity.IL2CPP.CompilerServices;
diff --git a/src/Internal/StructList.cs b/src/Internal/StructList.cs
index 7488304..1d6ad02 100644
--- a/src/Internal/StructList.cs
+++ b/src/Internal/StructList.cs
@@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Runtime.CompilerServices;
 
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
     [DebuggerDisplay("Count: {Count}")]
     internal struct StructList<T>
diff --git a/src/Internal/UnsafeArray.cs b/src/Internal/UnsafeArray.cs
index e7ad11a..4ec388b 100644
--- a/src/Internal/UnsafeArray.cs
+++ b/src/Internal/UnsafeArray.cs
@@ -10,7 +10,7 @@ using System.Runtime.CompilerServices;
 using Unity.IL2CPP.CompilerServices;
 #endif
 
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
 #if ENABLE_IL2CPP
     [Il2CppSetOption(Option.NullChecks, false)]
diff --git a/src/Pools/EcsPool.cs b/src/Pools/EcsPool.cs
index 375257a..63ae2a2 100644
--- a/src/Pools/EcsPool.cs
+++ b/src/Pools/EcsPool.cs
@@ -2,7 +2,7 @@
 #undef DEBUG
 #endif
 using DCFApixels.DragonECS.Core;
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using DCFApixels.DragonECS.PoolsCore;
 using System;
 using System.Collections;
diff --git a/src/Pools/EcsPoolBase.cs b/src/Pools/EcsPoolBase.cs
index 4793eaf..39c4617 100644
--- a/src/Pools/EcsPoolBase.cs
+++ b/src/Pools/EcsPoolBase.cs
@@ -1,7 +1,7 @@
 #if DISABLE_DEBUG
 #undef DEBUG
 #endif
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using DCFApixels.DragonECS.PoolsCore;
 using System;
 using System.Collections.Generic;
@@ -75,7 +75,7 @@ namespace DCFApixels.DragonECS.PoolsCore
     #endregion
 }
 
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
     [MetaColor(MetaColor.DragonRose)]
     [MetaGroup(EcsConsts.PACK_GROUP, EcsConsts.POOLS_GROUP)]
diff --git a/src/Pools/EcsTagPool.cs b/src/Pools/EcsTagPool.cs
index 72100cc..0ca0895 100644
--- a/src/Pools/EcsTagPool.cs
+++ b/src/Pools/EcsTagPool.cs
@@ -2,7 +2,7 @@
 #undef DEBUG
 #endif
 using DCFApixels.DragonECS.Core;
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using DCFApixels.DragonECS.PoolsCore;
 using System;
 using System.Collections;
diff --git a/src/Utils/AllowedInWorldsAttribute.cs b/src/Utils/AllowedInWorldsAttribute.cs
index 60c117f..447ce2e 100644
--- a/src/Utils/AllowedInWorldsAttribute.cs
+++ b/src/Utils/AllowedInWorldsAttribute.cs
@@ -1,7 +1,7 @@
 #if DISABLE_DEBUG
 #undef DEBUG
 #endif
-using DCFApixels.DragonECS.Internal;
+using DCFApixels.DragonECS.Core.Internal;
 using System;
 
 namespace DCFApixels.DragonECS
diff --git a/src/Utils/DependencyGraph.cs b/src/Utils/DependencyGraph.cs
index ede837e..210999c 100644
--- a/src/Utils/DependencyGraph.cs
+++ b/src/Utils/DependencyGraph.cs
@@ -1,11 +1,9 @@
 using DCFApixels.DragonECS.Core.Internal;
-using DCFApixels.DragonECS.Internal;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Runtime.CompilerServices;
 
 namespace DCFApixels.DragonECS.Core
 {
diff --git a/src/Utils/Exceptions.cs b/src/Utils/Exceptions.cs
index d4086a3..7245b3b 100644
--- a/src/Utils/Exceptions.cs
+++ b/src/Utils/Exceptions.cs
@@ -36,7 +36,7 @@ namespace DCFApixels.DragonECS
     }
 }
 
-namespace DCFApixels.DragonECS.Internal
+namespace DCFApixels.DragonECS.Core.Internal
 {
     internal static class Throw
     {
diff --git a/src/entlong.cs b/src/entlong.cs
index 4ed3662..36dac4e 100644
--- a/src/entlong.cs
+++ b/src/entlong.cs
@@ -3,8 +3,8 @@
 #endif
 #pragma warning disable IDE1006
 #pragma warning disable CS8981
+using DCFApixels.DragonECS.Core.Internal;
 using DCFApixels.DragonECS.Core.Unchecked;
-using DCFApixels.DragonECS.Internal;
 using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;