diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index a33fd7c..4784706 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_subdirectory(./base)
+add_subdirectory(./time)
 add_subdirectory(./logger)
 add_subdirectory(./debug)
 
diff --git a/modules/engine/CMakeLists.txt b/modules/engine/CMakeLists.txt
index d9dde7e..815af9f 100644
--- a/modules/engine/CMakeLists.txt
+++ b/modules/engine/CMakeLists.txt
@@ -3,14 +3,12 @@ if(NOT WIN32)
         core/application.cpp
         layer/layer.cpp
         layer/layer_stack.cpp
-        time/timer.cpp
     )
 else()
     add_library_module(engine 
         core/application.cpp
         layer/layer.cpp
         layer/layer_stack.cpp
-        time/timer.cpp
     )
 endif()
 
@@ -25,6 +23,7 @@ PUBLIC
     ecs 
     window
     glad
+    time
     opengl::opengl
     EnTT::EnTT
 )
diff --git a/modules/engine/include/engine/core/application.hpp b/modules/engine/include/engine/core/application.hpp
index c2d66bf..5485cc6 100644
--- a/modules/engine/include/engine/core/application.hpp
+++ b/modules/engine/include/engine/core/application.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <engine/time/timer.hpp>
+#include <time/timer.hpp>
 
 namespace lt {
 
diff --git a/modules/engine/include/engine/engine.hpp b/modules/engine/include/engine/engine.hpp
index 50cc2e6..9711082 100644
--- a/modules/engine/include/engine/engine.hpp
+++ b/modules/engine/include/engine/engine.hpp
@@ -3,8 +3,6 @@
 #include <engine/core/application.hpp>
 #include <engine/layer/layer.hpp>
 #include <engine/layer/layer_stack.hpp>
-#include <engine/time/timer.hpp>
-#include <imgui.h>
 #include <logger/logger.hpp>
 #include <renderer/framebuffer.hpp>
 #include <renderer/graphics_context.hpp>
diff --git a/modules/engine/rename.py b/modules/engine/rename.py
deleted file mode 100644
index 8679387..0000000
--- a/modules/engine/rename.py
+++ /dev/null
@@ -1,113 +0,0 @@
-import re
-import pathlib
-import sys
-import argparse
-from collections import defaultdict
-
-# Convert PascalCase to snake_case
-import re
-
-def to_snake_case(name):
-    # Skip if ALL CAPS (macros)
-    if name.isupper():
-        return name.lower()  # or just return name if you want to keep macros fully uppercase
-    
-    # Step 1: Split acronyms followed by normal PascalCase words (APIClient → API_Client)
-    name = re.sub(r'([A-Z]+)([A-Z][a-z])', r'\1_\2', name)
-
-    # Step 2: Split lowercase/digit to uppercase (fooBar → foo_Bar)
-    name = re.sub(r'(?<=[a-z0-9])(?=[A-Z])', '_', name)
-
-    # Step 3: Split letter-digit transitions only if digit is followed by uppercase letter  
-    name = re.sub(r'(?<=[a-zA-Z])(?=[0-9][A-Z])', '_', name)
-
-    # Step 4: Split digit-letter transitions (RGBA32Float → RGBA_32_Float)
-    name = re.sub(r'(?<=[0-9])(?=[a-zA-Z])', '_', name)
-
-    # Step 5: Fix accidental splits like '_2_D' → '_2d'
-    name = re.sub(r'_(\d+)_([a-z])', r'_\1\2', name, flags=re.IGNORECASE)
-
-    return name.lower()
-
-# Get all .cpp/.h/.hpp/.c files in the project (excluding vendor/third-party folders)
-def get_source_files(root_dir):
-    skip_dirs = {"vendor", "external", "third_party", "Dependencies", "build"}
-    for path in pathlib.Path(root_dir).rglob("*"):
-        if path.suffix.lower() in {".cpp", ".h", ".hpp", ".c"}:
-            if not any(part in skip_dirs for part in path.parts):
-                yield path
-
-# Extract PascalCase function names from definitions
-def extract_pascal_functions(code):
-    # Collect all class/struct names
-    class_names = set(re.findall(r'\b(class|struct)\s+([A-Za-z_][A-Za-z0-9_]*)', code))
-    class_names = {name for _, name in class_names}
-
-    # Match PascalCase function names, not prefixed with ~
-    candidates = re.findall(r'\b(?:[A-Za-z_][\w:<>]*)\s+([A-Z][A-Za-z0-9_]*)\s*\(', code)
-
-    valid_funcs = set()
-    for name in candidates:
-        if name.startswith("~"):
-            continue  # Skip destructors
-        if name in class_names:
-            continue  # Skip constructors
-        valid_funcs.add(name)
-
-    return valid_funcs
-
-# Rename function names in content
-def rename_usages(content, rename_map):
-    for original, replacement in rename_map.items():
-        # Word-boundary replace: only full function names (not part of other identifiers)
-        content = re.sub(rf'\b{original}\b', replacement, content)
-    return content
-
-def main():
-    parser = argparse.ArgumentParser(description="Rename project-defined PascalCase functions to snake_case")
-    parser.add_argument("project_dir", help="Path to project root")
-    parser.add_argument("--apply", action="store_true", help="Actually modify files")
-    args = parser.parse_args()
-
-    project_dir = args.project_dir
-    defined_functions = set()
-
-    print("[+] Scanning for function definitions...")
-    # First pass: collect function definitions
-    for file_path in get_source_files(project_dir):
-        try:
-            text = file_path.read_text(encoding='utf-8')
-            matches = extract_pascal_functions(text)
-            for name in matches:
-                if name.isidentifier() and not name.startswith("ImGui"):  # crude 3rd-party filter
-                    defined_functions.add(name)
-        except Exception as e:
-            print(f"[!] Error reading {file_path}: {e}")
-
-    if not defined_functions:
-        print("[-] No PascalCase function definitions found.")
-        return
-
-    rename_map = {name: to_snake_case(name) for name in defined_functions if name != to_snake_case(name)}
-
-    print(f"[+] Found {len(rename_map)} functions to rename:")
-    for orig, snake in rename_map.items():
-        print(f"    {orig} → {snake}")
-
-    if not args.apply:
-        print("\n[DRY RUN] No files will be modified. Use --apply to perform renaming.\n")
-
-    # Second pass: apply renaming
-    for file_path in get_source_files(project_dir):
-        try:
-            content = file_path.read_text(encoding='utf-8')
-            new_content = rename_usages(content, rename_map)
-            if new_content != content:
-                print(f"[~] Updating {file_path}")
-                if args.apply:
-                    file_path.write_text(new_content, encoding='utf-8')
-        except Exception as e:
-            print(f"[!] Error processing {file_path}: {e}")
-
-if __name__ == "__main__":
-    main()
diff --git a/modules/engine/src/core/application.cpp b/modules/engine/src/core/application.cpp
index cd16a48..ab7995a 100644
--- a/modules/engine/src/core/application.cpp
+++ b/modules/engine/src/core/application.cpp
@@ -3,7 +3,6 @@
 #include <engine/core/application.hpp>
 #include <engine/layer/layer.hpp>
 #include <engine/layer/layer_stack.hpp>
-#include <engine/time/timer.hpp>
 #include <input/events/event.hpp>
 #include <input/events/keyboard.hpp>
 #include <input/events/window.hpp>
diff --git a/modules/mirror/include/mirror/editor_layer.hpp b/modules/mirror/include/mirror/editor_layer.hpp
index 1bba82f..2e624f1 100644
--- a/modules/mirror/include/mirror/editor_layer.hpp
+++ b/modules/mirror/include/mirror/editor_layer.hpp
@@ -2,6 +2,7 @@
 
 #include <engine/engine.hpp>
 #include <glm/gtc/matrix_transform.hpp>
+#include <imgui.h>
 #include <mirror/panel/asset_browser.hpp>
 #include <mirror/panel/properties.hpp>
 #include <mirror/panel/scene_hierarchy.hpp>
diff --git a/modules/time/CMakeLists.txt b/modules/time/CMakeLists.txt
new file mode 100644
index 0000000..2f77dbd
--- /dev/null
+++ b/modules/time/CMakeLists.txt
@@ -0,0 +1 @@
+add_library_module(time timer.cpp)
diff --git a/modules/engine/include/engine/time/timer.hpp b/modules/time/include/time/timer.hpp
similarity index 99%
rename from modules/engine/include/engine/time/timer.hpp
rename to modules/time/include/time/timer.hpp
index ef69cac..54a603b 100644
--- a/modules/engine/include/engine/time/timer.hpp
+++ b/modules/time/include/time/timer.hpp
@@ -2,7 +2,6 @@
 
 #include <chrono>
 
-
 namespace lt {
 
 class Timer
diff --git a/modules/engine/src/time/timer.cpp b/modules/time/src/timer.cpp
similarity index 74%
rename from modules/engine/src/time/timer.cpp
rename to modules/time/src/timer.cpp
index 183e979..2ce05bc 100644
--- a/modules/engine/src/time/timer.cpp
+++ b/modules/time/src/timer.cpp
@@ -1,4 +1,4 @@
-#include <engine/time/timer.hpp>
+#include <time/timer.hpp>
 
 namespace lt {