diff --git a/src/Flecs.NET/Core/Ecs.cs b/src/Flecs.NET/Core/Ecs/Aliases.cs
similarity index 54%
rename from src/Flecs.NET/Core/Ecs.cs
rename to src/Flecs.NET/Core/Ecs/Aliases.cs
index 284b0da5..335159bb 100644
--- a/src/Flecs.NET/Core/Ecs.cs
+++ b/src/Flecs.NET/Core/Ecs/Aliases.cs
@@ -1,480 +1,7 @@
-using System;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-using Flecs.NET.Bindings;
-using Flecs.NET.Utilities;
 using static Flecs.NET.Bindings.Native;
 
 namespace Flecs.NET.Core
 {
-    /// <summary>
-    ///     A static class for storing ECS related globals.
-    /// </summary>
-    public static partial class Ecs
-    {
-        /// <summary>
-        ///     Default path separator.
-        /// </summary>
-        public const string DefaultSeparator = ".";
-
-        /// <summary>
-        ///     Default path root.
-        /// </summary>
-        public const string DefaultRootSeparator = "::";
-    }
-
-    // TODO: Add proper logging
-    // Debug
-    public static partial class Ecs
-    {
-#if NETCOREAPP3_0_OR_GREATER
-        /// <summary>
-        ///     Debug assert.
-        /// </summary>
-        /// <param name="condition"></param>
-        /// <param name="message"></param>
-        /// <param name="line"></param>
-        /// <param name="member"></param>
-        /// <param name="file"></param>
-        /// <param name="conditionStr"></param>
-        [Conditional("DEBUG")]
-        public static void Assert(
-            bool condition,
-            string message = "",
-            [CallerLineNumber] int line = default,
-            [CallerMemberName] string member = "",
-            [CallerFilePath] string file = "",
-            [CallerArgumentExpression("condition")] string conditionStr = "")
-        {
-            if (condition)
-                return;
-
-            throw new AssertionException($"\n[Flecs.NET Assertion Failed]: {member}, Line {line}, {file}\n[Condition]: {conditionStr}\n[Assertion Message]: {message}");
-        }
-
-        /// <summary>
-        ///     Debug assert.
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="line"></param>
-        /// <param name="member"></param>
-        /// <param name="file"></param>
-        [Conditional("DEBUG")]
-        public static void Error(
-            string message = "",
-            [CallerLineNumber] int line = default,
-            [CallerMemberName] string member = "",
-            [CallerFilePath] string file = "")
-        {
-            throw new ErrorException($"\n[Flecs.NET Error]: {member}, Line {line}, {file}\n[Error Message]: {message}");
-        }
-#else
-        /// <summary>
-        ///     Debug assert.
-        /// </summary>
-        /// <param name="condition"></param>
-        /// <param name="message"></param>
-        /// <param name="line"></param>
-        /// <param name="member"></param>
-        /// <param name="file"></param>
-        [Conditional("DEBUG")]
-        public static void Assert(
-            bool condition,
-            string message = "",
-            [CallerLineNumber] int line = default,
-            [CallerMemberName] string member = "",
-            [CallerFilePath] string file = "")
-        {
-            if (condition)
-                return;
-
-            throw new AssertionException($"\n[Flecs.NET Assertion Failed]: {member}, Line {line}, {file}\n[Assertion Message]: {message}");
-        }
-
-        /// <summary>
-        ///     Debug assert.
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="line"></param>
-        /// <param name="member"></param>
-        /// <param name="file"></param>
-        [Conditional("DEBUG")]
-        public static void Error(
-            string message = "",
-            [CallerLineNumber] int line = default,
-            [CallerMemberName] string member = "",
-            [CallerFilePath] string file = "")
-        {
-            throw new ErrorException($"\n[Flecs.NET Error]: {member}, Line {line}, {file}\n[Error Message]: {message}");
-        }
-#endif
-
-        /// <summary>
-        ///     Flecs.NET assertion exception.
-        /// </summary>
-        [Serializable]
-        public class AssertionException : Exception
-        {
-            /// <summary>
-            ///
-            /// </summary>
-            public AssertionException()
-            {
-            }
-
-            /// <summary>
-            ///
-            /// </summary>
-            /// <param name="message"></param>
-            public AssertionException(string message) : base(message)
-            {
-            }
-
-            /// <summary>
-            ///
-            /// </summary>
-            /// <param name="message"></param>
-            /// <param name="innerException"></param>
-            public AssertionException(string message, Exception innerException) : base(message, innerException)
-            {
-            }
-        }
-
-        /// <summary>
-        ///     Flecs.NET error exception.
-        /// </summary>
-        [Serializable]
-        public class ErrorException : Exception
-        {
-            /// <summary>
-            ///
-            /// </summary>
-            public ErrorException()
-            {
-            }
-
-            /// <summary>
-            ///
-            /// </summary>
-            /// <param name="message"></param>
-            public ErrorException(string message) : base(message)
-            {
-            }
-
-            /// <summary>
-            ///
-            /// </summary>
-            /// <param name="message"></param>
-            /// <param name="innerException"></param>
-            public ErrorException(string message, Exception innerException) : base(message, innerException)
-            {
-            }
-        }
-
-        /// <summary>
-        ///     Flecs native exception.
-        /// </summary>
-        [Serializable]
-        public class NativeException : Exception
-        {
-            /// <summary>
-            ///
-            /// </summary>
-            public NativeException()
-            {
-            }
-
-            /// <summary>
-            ///
-            /// </summary>
-            /// <param name="message"></param>
-            public NativeException(string message) : base(message)
-            {
-            }
-
-            /// <summary>
-            ///
-            /// </summary>
-            /// <param name="message"></param>
-            /// <param name="innerException"></param>
-            public NativeException(string message, Exception innerException) : base(message, innerException)
-            {
-            }
-        }
-    }
-
-    // Log namespace
-    public static unsafe partial class Ecs
-    {
-        /// <summary>
-        ///     Static class for flecs logging functions.
-        /// </summary>
-        public static class Log
-        {
-            /// <summary>
-            ///     Set log level.
-            /// </summary>
-            /// <param name="level"></param>
-            public static void SetLevel(int level)
-            {
-                _ = ecs_log_set_level(level);
-            }
-
-            /// <summary>
-            ///     Get log level.
-            /// </summary>
-            /// <returns></returns>
-            public static int GetLevel()
-            {
-                return ecs_log_get_level();
-            }
-
-            /// <summary>
-            ///     Enable colors in logging.
-            /// </summary>
-            /// <param name="enabled"></param>
-            public static void EnableColors(bool enabled = true)
-            {
-                ecs_log_enable_colors(Macros.Bool(enabled));
-            }
-
-            /// <summary>
-            ///     Enable timestamps in logging.
-            /// </summary>
-            /// <param name="enabled"></param>
-            public static void EnableTimestamp(bool enabled = true)
-            {
-                ecs_log_enable_timestamp(Macros.Bool(enabled));
-            }
-
-            /// <summary>
-            ///     Enable time delta in logging.
-            /// </summary>
-            /// <param name="enabled"></param>
-            public static void EnableTimeDelta(bool enabled = true)
-            {
-                ecs_log_enable_timedelta(Macros.Bool(enabled));
-            }
-
-            /// <summary>
-            ///     Debug trace (Level 1)
-            /// </summary>
-            /// <param name="message"></param>
-            /// <param name="file"></param>
-            /// <param name="line"></param>
-            public static void Dbg(string message, [CallerFilePath] string file = "", [CallerLineNumber] int line = 0)
-            {
-                using NativeString nativeMessage = (NativeString)message;
-                using NativeString nativeFile = (NativeString)file;
-                ecs_log_(1, nativeFile, line, nativeMessage);
-            }
-
-            /// <summary>
-            ///     Trace (Level 0)
-            /// </summary>
-            /// <param name="message"></param>
-            /// <param name="file"></param>
-            /// <param name="line"></param>
-            public static void Trace(string message = "", [CallerFilePath] string file = "",
-                [CallerLineNumber] int line = 0)
-            {
-                using NativeString nativeMessage = (NativeString)message;
-                using NativeString nativeFile = (NativeString)file;
-                ecs_log_(0, nativeFile, line, nativeMessage);
-            }
-
-            /// <summary>
-            ///     Trace (Level -2)
-            /// </summary>
-            /// <param name="message"></param>
-            /// <param name="file"></param>
-            /// <param name="line"></param>
-            public static void Warn(string message, [CallerFilePath] string file = "", [CallerLineNumber] int line = 0)
-            {
-                using NativeString nativeMessage = (NativeString)message;
-                using NativeString nativeFile = (NativeString)file;
-                ecs_log_(-2, nativeFile, line, nativeMessage);
-            }
-
-            /// <summary>
-            ///     Trace (Level -3)
-            /// </summary>
-            /// <param name="message"></param>
-            /// <param name="file"></param>
-            /// <param name="line"></param>
-            public static void Err(string message, [CallerFilePath] string file = "", [CallerLineNumber] int line = 0)
-            {
-                using NativeString nativeMessage = (NativeString)message;
-                using NativeString nativeFile = (NativeString)file;
-                ecs_log_(-3, nativeFile, line, nativeMessage);
-            }
-
-            /// <summary>
-            ///     Trace (Level 0)
-            /// </summary>
-            /// <param name="message"></param>
-            /// <param name="file"></param>
-            /// <param name="line"></param>
-            public static void Push(string message, [CallerFilePath] string file = "", [CallerLineNumber] int line = 0)
-            {
-                using NativeString nativeMessage = (NativeString)message;
-                using NativeString nativeFile = (NativeString)file;
-                ecs_log_(1, nativeFile, line, nativeMessage);
-                ecs_log_push_(0);
-            }
-
-            /// <summary>
-            ///     Increase log indentation.
-            /// </summary>
-            public static void Push()
-            {
-                ecs_log_push_(0);
-            }
-
-            /// <summary>
-            ///     Decrease log indentation.
-            /// </summary>
-            public static void Pop()
-            {
-                ecs_log_pop_(0);
-            }
-        }
-    }
-
-    // Delegates
-    public static unsafe partial class Ecs
-    {
-        /// <summary>
-        ///     App init action.
-        /// </summary>
-        public delegate int AppInitAction(ecs_world_t* world);
-
-        /// <summary>
-        ///     Context free.
-        /// </summary>
-        public delegate void ContextFree(void* ctx);
-
-        /// <summary>
-        ///     Copy type hook callback.
-        /// </summary>
-        public delegate void CopyCallback(void* src, void* dst, int count, ecs_type_info_t* typeInfo);
-
-        /// <summary>
-        ///     Copy type hook callback.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public delegate void CopyCallback<T>(ref T src, ref T dst, TypeInfo typeInfo);
-
-        /// <summary>
-        ///     Ctor type hook callback.
-        /// </summary>
-        public delegate void CtorCallback(void* data, int count, ecs_type_info_t* typeInfo);
-
-        /// <summary>
-        ///     Ctor type hook callback.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public delegate void CtorCallback<T>(ref T data, TypeInfo typeInfo);
-
-        /// <summary>
-        ///     Dtor type hook callback.
-        /// </summary>
-        public delegate void DtorCallback(void* data, int count, ecs_type_info_t* typeInfo);
-
-        /// <summary>
-        ///     Dtor type hook callback.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public delegate void DtorCallback<T>(ref T data, TypeInfo typeInfo);
-
-        /// <summary>
-        ///     Each entity callback.
-        /// </summary>
-        public delegate void EachEntityCallback(Entity entity);
-
-        /// <summary>
-        ///     Each id callback.
-        /// </summary>
-        public delegate void EachIdCallback(Id id);
-
-        /// <summary>
-        ///     Each index callback.
-        /// </summary>
-        public delegate void EachIndexCallback(Iter it, int i);
-
-        /// <summary>
-        ///     Finish action.
-        /// </summary>
-        public delegate void FiniAction(ecs_world_t* world, void* ctx);
-
-        /// <summary>
-        ///     Free.
-        /// </summary>
-        public delegate void Free(IntPtr data);
-
-        /// <summary>
-        ///     GroupBy action.
-        /// </summary>
-        public delegate ulong GroupByAction(ecs_world_t* world, ecs_table_t* table, ulong groupId, void* ctx);
-
-        /// <summary>
-        ///     GroupBy action.
-        /// </summary>
-        public delegate ulong GroupByCallback(World world, Table table, Entity group);
-
-        /// <summary>
-        ///     Group create action.
-        /// </summary>
-        public delegate void* GroupCreateAction(ecs_world_t* world, ulong groupId, void* groupByCtx);
-
-        /// <summary>
-        ///     Group delete action.
-        /// </summary>
-        public delegate void GroupDeleteAction(ecs_world_t* world, ulong groupId, void* groupCtx, void* groupByCtx);
-
-        /// <summary>
-        ///     Iter action.
-        /// </summary>
-        public delegate void IterAction(ecs_iter_t* it);
-
-        /// <summary>
-        ///     Iter callback.
-        /// </summary>
-        public delegate void IterCallback(Iter it);
-
-        /// <summary>
-        ///     Iter next action.
-        /// </summary>
-        public delegate byte IterNextAction(ecs_iter_t* it);
-
-        /// <summary>
-        ///     Move type hook callback.
-        /// </summary>
-        public delegate void MoveCallback(void* src, void* dst, int count, ecs_type_info_t* typeInfo);
-
-        /// <summary>
-        ///     Move type hook callback.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public delegate void MoveCallback<T>(ref T src, ref T dst, TypeInfo typeInfo);
-
-        /// <summary>
-        ///     OrderBy action.
-        /// </summary>
-        public delegate int OrderByAction(ulong e1, void* ptr1, ulong e2, void* ptr2);
-
-        /// <summary>
-        ///     A callback that takes a reference to a world.
-        /// </summary>
-        public delegate void WorldCallback(ref World world);
-
-        /// <summary>
-        ///     A callback that takes a reference to a term.
-        /// </summary>
-        public delegate void TermCallback(ref Term term);
-    }
-
-    // Built-in global entities, tags, and flags.
     public static partial class Ecs
     {
         // Enums
@@ -1078,34 +605,4 @@ public static partial class Ecs
         /// </summary>
         public static ref ulong Quantity => ref EcsQuantity;
     }
-
-    // Static classes
-    public static partial class Ecs
-    {
-        /// <summary>
-        ///     Utilities for documenting entities, components and systems.
-        /// </summary>
-        public static class Doc
-        {
-            /// <summary>
-            ///     Reference to <see cref="EcsDocBrief"/>.
-            /// </summary>
-            public static ref ulong Brief => ref EcsDocBrief;
-
-            /// <summary>
-            ///     Reference to <see cref="EcsDocDetail"/>.
-            /// </summary>
-            public static ref ulong Detail => ref EcsDocDetail;
-
-            /// <summary>
-            ///     Reference to <see cref="EcsDocLink"/>.
-            /// </summary>
-            public static ref ulong Link => ref EcsDocLink;
-
-            /// <summary>
-            ///     Reference to <see cref="EcsDocColor"/>.
-            /// </summary>
-            public static ref ulong Color => ref EcsDocColor;
-        }
-    }
 }
diff --git a/src/Flecs.NET/Core/Ecs/Constants.cs b/src/Flecs.NET/Core/Ecs/Constants.cs
new file mode 100644
index 00000000..5ca3d85a
--- /dev/null
+++ b/src/Flecs.NET/Core/Ecs/Constants.cs
@@ -0,0 +1,15 @@
+namespace Flecs.NET.Core
+{
+    public static partial class Ecs
+    {
+        /// <summary>
+        ///     Default path separator.
+        /// </summary>
+        public const string DefaultSeparator = ".";
+
+        /// <summary>
+        ///     Default path root.
+        /// </summary>
+        public const string DefaultRootSeparator = "::";
+    }
+}
diff --git a/src/Flecs.NET/Core/Ecs/Debug.cs b/src/Flecs.NET/Core/Ecs/Debug.cs
new file mode 100644
index 00000000..16f5c067
--- /dev/null
+++ b/src/Flecs.NET/Core/Ecs/Debug.cs
@@ -0,0 +1,91 @@
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+
+namespace Flecs.NET.Core
+{
+    public static partial class Ecs
+    {
+#if NETCOREAPP3_0_OR_GREATER
+        /// <summary>
+        ///     Debug assert.
+        /// </summary>
+        /// <param name="condition"></param>
+        /// <param name="message"></param>
+        /// <param name="line"></param>
+        /// <param name="member"></param>
+        /// <param name="file"></param>
+        /// <param name="conditionStr"></param>
+        [Conditional("DEBUG")]
+        public static void Assert(
+            bool condition,
+            string message = "",
+            [CallerLineNumber] int line = default,
+            [CallerMemberName] string member = "",
+            [CallerFilePath] string file = "",
+            [CallerArgumentExpression("condition")] string conditionStr = "")
+        {
+            if (condition)
+                return;
+
+            throw new AssertionException($"\n[Flecs.NET Assertion Failed]: {member}, Line {line}, {file}\n[Condition]: {conditionStr}\n[Assertion Message]: {message}");
+        }
+
+        /// <summary>
+        ///     Debug assert.
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="line"></param>
+        /// <param name="member"></param>
+        /// <param name="file"></param>
+        [Conditional("DEBUG")]
+        public static void Error(
+            string message = "",
+            [CallerLineNumber] int line = default,
+            [CallerMemberName] string member = "",
+            [CallerFilePath] string file = "")
+        {
+            throw new ErrorException($"\n[Flecs.NET Error]: {member}, Line {line}, {file}\n[Error Message]: {message}");
+        }
+#else
+        /// <summary>
+        ///     Debug assert.
+        /// </summary>
+        /// <param name="condition"></param>
+        /// <param name="message"></param>
+        /// <param name="line"></param>
+        /// <param name="member"></param>
+        /// <param name="file"></param>
+        [Conditional("DEBUG")]
+        public static void Assert(
+            bool condition,
+            string message = "",
+            [CallerLineNumber] int line = default,
+            [CallerMemberName] string member = "",
+            [CallerFilePath] string file = "")
+        {
+            if (condition)
+                return;
+
+            throw new AssertionException(
+                $"\n[Flecs.NET Assertion Failed]: {member}, Line {line}, {file}\n[Assertion Message]: {message}");
+        }
+
+        /// <summary>
+        ///     Debug assert.
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="line"></param>
+        /// <param name="member"></param>
+        /// <param name="file"></param>
+        [Conditional("DEBUG")]
+        public static void Error(
+            string message = "",
+            [CallerLineNumber] int line = default,
+            [CallerMemberName] string member = "",
+            [CallerFilePath] string file = "")
+        {
+            throw new ErrorException($"\n[Flecs.NET Error]: {member}, Line {line}, {file}\n[Error Message]: {message}");
+        }
+#endif
+    }
+}
diff --git a/src/Flecs.NET/Core/Ecs/Delegates.cs b/src/Flecs.NET/Core/Ecs/Delegates.cs
new file mode 100644
index 00000000..e71b3e10
--- /dev/null
+++ b/src/Flecs.NET/Core/Ecs/Delegates.cs
@@ -0,0 +1,137 @@
+using System;
+using static Flecs.NET.Bindings.Native;
+
+namespace Flecs.NET.Core
+{
+    public static unsafe partial class Ecs
+    {
+        /// <summary>
+        ///     App init action.
+        /// </summary>
+        public delegate int AppInitAction(ecs_world_t* world);
+
+        /// <summary>
+        ///     Context free.
+        /// </summary>
+        public delegate void ContextFree(void* ctx);
+
+        /// <summary>
+        ///     Copy type hook callback.
+        /// </summary>
+        public delegate void CopyCallback(void* src, void* dst, int count, ecs_type_info_t* typeInfo);
+
+        /// <summary>
+        ///     Copy type hook callback.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        public delegate void CopyCallback<T>(ref T src, ref T dst, TypeInfo typeInfo);
+
+        /// <summary>
+        ///     Ctor type hook callback.
+        /// </summary>
+        public delegate void CtorCallback(void* data, int count, ecs_type_info_t* typeInfo);
+
+        /// <summary>
+        ///     Ctor type hook callback.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        public delegate void CtorCallback<T>(ref T data, TypeInfo typeInfo);
+
+        /// <summary>
+        ///     Dtor type hook callback.
+        /// </summary>
+        public delegate void DtorCallback(void* data, int count, ecs_type_info_t* typeInfo);
+
+        /// <summary>
+        ///     Dtor type hook callback.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        public delegate void DtorCallback<T>(ref T data, TypeInfo typeInfo);
+
+        /// <summary>
+        ///     Each entity callback.
+        /// </summary>
+        public delegate void EachEntityCallback(Entity entity);
+
+        /// <summary>
+        ///     Each id callback.
+        /// </summary>
+        public delegate void EachIdCallback(Id id);
+
+        /// <summary>
+        ///     Each index callback.
+        /// </summary>
+        public delegate void EachIndexCallback(Iter it, int i);
+
+        /// <summary>
+        ///     Finish action.
+        /// </summary>
+        public delegate void FiniAction(ecs_world_t* world, void* ctx);
+
+        /// <summary>
+        ///     Free.
+        /// </summary>
+        public delegate void Free(IntPtr data);
+
+        /// <summary>
+        ///     GroupBy action.
+        /// </summary>
+        public delegate ulong GroupByAction(ecs_world_t* world, ecs_table_t* table, ulong groupId, void* ctx);
+
+        /// <summary>
+        ///     GroupBy action.
+        /// </summary>
+        public delegate ulong GroupByCallback(World world, Table table, Entity group);
+
+        /// <summary>
+        ///     Group create action.
+        /// </summary>
+        public delegate void* GroupCreateAction(ecs_world_t* world, ulong groupId, void* groupByCtx);
+
+        /// <summary>
+        ///     Group delete action.
+        /// </summary>
+        public delegate void GroupDeleteAction(ecs_world_t* world, ulong groupId, void* groupCtx, void* groupByCtx);
+
+        /// <summary>
+        ///     Iter action.
+        /// </summary>
+        public delegate void IterAction(ecs_iter_t* it);
+
+        /// <summary>
+        ///     Iter callback.
+        /// </summary>
+        public delegate void IterCallback(Iter it);
+
+        /// <summary>
+        ///     Iter next action.
+        /// </summary>
+        public delegate byte IterNextAction(ecs_iter_t* it);
+
+        /// <summary>
+        ///     Move type hook callback.
+        /// </summary>
+        public delegate void MoveCallback(void* src, void* dst, int count, ecs_type_info_t* typeInfo);
+
+        /// <summary>
+        ///     Move type hook callback.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        public delegate void MoveCallback<T>(ref T src, ref T dst, TypeInfo typeInfo);
+
+        /// <summary>
+        ///     OrderBy action.
+        /// </summary>
+        public delegate int OrderByAction(ulong e1, void* ptr1, ulong e2, void* ptr2);
+
+        /// <summary>
+        ///     A callback that takes a reference to a world.
+        /// </summary>
+        public delegate void WorldCallback(ref World world);
+
+        /// <summary>
+        ///     A callback that takes a reference to a term.
+        /// </summary>
+        public delegate void TermCallback(ref Term term);
+    }
+}
diff --git a/src/Flecs.NET/Core/Ecs/Doc.cs b/src/Flecs.NET/Core/Ecs/Doc.cs
new file mode 100644
index 00000000..e0239eda
--- /dev/null
+++ b/src/Flecs.NET/Core/Ecs/Doc.cs
@@ -0,0 +1,33 @@
+using static Flecs.NET.Bindings.Native;
+
+namespace Flecs.NET.Core
+{
+    public static partial class Ecs
+    {
+        /// <summary>
+        ///     Utilities for documenting entities, components and systems.
+        /// </summary>
+        public static class Doc
+        {
+            /// <summary>
+            ///     Reference to <see cref="EcsDocBrief"/>.
+            /// </summary>
+            public static ref ulong Brief => ref EcsDocBrief;
+
+            /// <summary>
+            ///     Reference to <see cref="EcsDocDetail"/>.
+            /// </summary>
+            public static ref ulong Detail => ref EcsDocDetail;
+
+            /// <summary>
+            ///     Reference to <see cref="EcsDocLink"/>.
+            /// </summary>
+            public static ref ulong Link => ref EcsDocLink;
+
+            /// <summary>
+            ///     Reference to <see cref="EcsDocColor"/>.
+            /// </summary>
+            public static ref ulong Color => ref EcsDocColor;
+        }
+    }
+}
diff --git a/src/Flecs.NET/Core/Ecs/Ecs.cs b/src/Flecs.NET/Core/Ecs/Ecs.cs
new file mode 100644
index 00000000..92126339
--- /dev/null
+++ b/src/Flecs.NET/Core/Ecs/Ecs.cs
@@ -0,0 +1,5 @@
+namespace Flecs.NET.Core
+{
+    ///
+    public static partial class Ecs { }
+}
diff --git a/src/Flecs.NET/Core/Ecs/Exceptions.cs b/src/Flecs.NET/Core/Ecs/Exceptions.cs
new file mode 100644
index 00000000..1796149e
--- /dev/null
+++ b/src/Flecs.NET/Core/Ecs/Exceptions.cs
@@ -0,0 +1,100 @@
+using System;
+
+namespace Flecs.NET.Core
+{
+    public static partial class Ecs
+    {
+        /// <summary>
+        ///     Flecs.NET assertion exception.
+        /// </summary>
+        [Serializable]
+        public class AssertionException : Exception
+        {
+            /// <summary>
+            ///
+            /// </summary>
+            public AssertionException()
+            {
+            }
+
+            /// <summary>
+            ///
+            /// </summary>
+            /// <param name="message"></param>
+            public AssertionException(string message) : base(message)
+            {
+            }
+
+            /// <summary>
+            ///
+            /// </summary>
+            /// <param name="message"></param>
+            /// <param name="innerException"></param>
+            public AssertionException(string message, Exception innerException) : base(message, innerException)
+            {
+            }
+        }
+
+        /// <summary>
+        ///     Flecs.NET error exception.
+        /// </summary>
+        [Serializable]
+        public class ErrorException : Exception
+        {
+            /// <summary>
+            ///
+            /// </summary>
+            public ErrorException()
+            {
+            }
+
+            /// <summary>
+            ///
+            /// </summary>
+            /// <param name="message"></param>
+            public ErrorException(string message) : base(message)
+            {
+            }
+
+            /// <summary>
+            ///
+            /// </summary>
+            /// <param name="message"></param>
+            /// <param name="innerException"></param>
+            public ErrorException(string message, Exception innerException) : base(message, innerException)
+            {
+            }
+        }
+
+        /// <summary>
+        ///     Flecs native exception.
+        /// </summary>
+        [Serializable]
+        public class NativeException : Exception
+        {
+            /// <summary>
+            ///
+            /// </summary>
+            public NativeException()
+            {
+            }
+
+            /// <summary>
+            ///
+            /// </summary>
+            /// <param name="message"></param>
+            public NativeException(string message) : base(message)
+            {
+            }
+
+            /// <summary>
+            ///
+            /// </summary>
+            /// <param name="message"></param>
+            /// <param name="innerException"></param>
+            public NativeException(string message, Exception innerException) : base(message, innerException)
+            {
+            }
+        }
+    }
+}
diff --git a/src/Flecs.NET/Core/Ecs/Log.cs b/src/Flecs.NET/Core/Ecs/Log.cs
new file mode 100644
index 00000000..e3c727ec
--- /dev/null
+++ b/src/Flecs.NET/Core/Ecs/Log.cs
@@ -0,0 +1,143 @@
+using System.Runtime.CompilerServices;
+using Flecs.NET.Utilities;
+using static Flecs.NET.Bindings.Native;
+
+namespace Flecs.NET.Core
+{
+    public static unsafe partial class Ecs
+    {
+        /// <summary>
+        ///     Static class for flecs logging functions.
+        /// </summary>
+        public static class Log
+        {
+            /// <summary>
+            ///     Set log level.
+            /// </summary>
+            /// <param name="level"></param>
+            public static void SetLevel(int level)
+            {
+                _ = ecs_log_set_level(level);
+            }
+
+            /// <summary>
+            ///     Get log level.
+            /// </summary>
+            /// <returns></returns>
+            public static int GetLevel()
+            {
+                return ecs_log_get_level();
+            }
+
+            /// <summary>
+            ///     Enable colors in logging.
+            /// </summary>
+            /// <param name="enabled"></param>
+            public static void EnableColors(bool enabled = true)
+            {
+                ecs_log_enable_colors(Macros.Bool(enabled));
+            }
+
+            /// <summary>
+            ///     Enable timestamps in logging.
+            /// </summary>
+            /// <param name="enabled"></param>
+            public static void EnableTimestamp(bool enabled = true)
+            {
+                ecs_log_enable_timestamp(Macros.Bool(enabled));
+            }
+
+            /// <summary>
+            ///     Enable time delta in logging.
+            /// </summary>
+            /// <param name="enabled"></param>
+            public static void EnableTimeDelta(bool enabled = true)
+            {
+                ecs_log_enable_timedelta(Macros.Bool(enabled));
+            }
+
+            /// <summary>
+            ///     Debug trace (Level 1)
+            /// </summary>
+            /// <param name="message"></param>
+            /// <param name="file"></param>
+            /// <param name="line"></param>
+            public static void Dbg(string message, [CallerFilePath] string file = "", [CallerLineNumber] int line = 0)
+            {
+                using NativeString nativeMessage = (NativeString)message;
+                using NativeString nativeFile = (NativeString)file;
+                ecs_log_(1, nativeFile, line, nativeMessage);
+            }
+
+            /// <summary>
+            ///     Trace (Level 0)
+            /// </summary>
+            /// <param name="message"></param>
+            /// <param name="file"></param>
+            /// <param name="line"></param>
+            public static void Trace(string message = "", [CallerFilePath] string file = "",
+                [CallerLineNumber] int line = 0)
+            {
+                using NativeString nativeMessage = (NativeString)message;
+                using NativeString nativeFile = (NativeString)file;
+                ecs_log_(0, nativeFile, line, nativeMessage);
+            }
+
+            /// <summary>
+            ///     Trace (Level -2)
+            /// </summary>
+            /// <param name="message"></param>
+            /// <param name="file"></param>
+            /// <param name="line"></param>
+            public static void Warn(string message, [CallerFilePath] string file = "", [CallerLineNumber] int line = 0)
+            {
+                using NativeString nativeMessage = (NativeString)message;
+                using NativeString nativeFile = (NativeString)file;
+                ecs_log_(-2, nativeFile, line, nativeMessage);
+            }
+
+            /// <summary>
+            ///     Trace (Level -3)
+            /// </summary>
+            /// <param name="message"></param>
+            /// <param name="file"></param>
+            /// <param name="line"></param>
+            public static void Err(string message, [CallerFilePath] string file = "", [CallerLineNumber] int line = 0)
+            {
+                using NativeString nativeMessage = (NativeString)message;
+                using NativeString nativeFile = (NativeString)file;
+                ecs_log_(-3, nativeFile, line, nativeMessage);
+            }
+
+            /// <summary>
+            ///     Trace (Level 0)
+            /// </summary>
+            /// <param name="message"></param>
+            /// <param name="file"></param>
+            /// <param name="line"></param>
+            public static void Push(string message, [CallerFilePath] string file = "", [CallerLineNumber] int line = 0)
+            {
+                using NativeString nativeMessage = (NativeString)message;
+                using NativeString nativeFile = (NativeString)file;
+                ecs_log_(1, nativeFile, line, nativeMessage);
+                ecs_log_push_(0);
+            }
+
+            /// <summary>
+            ///     Increase log indentation.
+            /// </summary>
+            public static void Push()
+            {
+                ecs_log_push_(0);
+            }
+
+            /// <summary>
+            ///     Decrease log indentation.
+            /// </summary>
+            public static void Pop()
+            {
+                ecs_log_pop_(0);
+            }
+        }
+    }
+}
diff --git a/src/Flecs.NET/Utilities/Macros.cs b/src/Flecs.NET/Utilities/Macros.cs
index b2766cfd..fab336f9 100644
--- a/src/Flecs.NET/Utilities/Macros.cs
+++ b/src/Flecs.NET/Utilities/Macros.cs
@@ -54,7 +54,7 @@ public static bool Bool(byte value)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool AreSameReadOnlyRefs<T>(in T a, in T b)
         {
-            return Unsafe.AreSame(ref Unsafe.AsRef(a), ref Unsafe.AsRef(b));
+            return Unsafe.AreSame(ref Unsafe.AsRef(in a), ref Unsafe.AsRef(in b));
         }
 
         /// <summary>