diff --git a/.idea/codeflash.iml b/.idea/codeflash.iml
index 5ced23495..d34fc2d94 100644
--- a/.idea/codeflash.iml
+++ b/.idea/codeflash.iml
@@ -5,7 +5,7 @@
       <configuration>
         <option name="rootFolder" value="$MODULE_DIR$/django/aiservice" />
         <option name="settingsModule" value="aiservice/settings.py" />
-        <option name="manageScript" value="aiservice/manage.py" />
+        <option name="manageScript" value="manage.py" />
         <option name="environment" value="&lt;map/&gt;" />
         <option name="doNotUseTestRunner" value="false" />
         <option name="trackFilePattern" value="" />
diff --git a/.idea/runConfigurations/aiservice.xml b/.idea/runConfigurations/aiservice.xml
index fd366f40e..a97aaa082 100644
--- a/.idea/runConfigurations/aiservice.xml
+++ b/.idea/runConfigurations/aiservice.xml
@@ -6,7 +6,7 @@
     <option name="PARENT_ENVS" value="true" />
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
-      <env name="DJANGO_SETTINGS_MODULE" value="settings" />
+      <env name="DJANGO_SETTINGS_MODULE" value="aiservice.settings" />
     </envs>
     <option name="SDK_HOME" value="$USER_HOME$/mambaforge/envs/aiservice/bin/python" />
     <option name="SDK_NAME" value="$USER_HOME$/miniforge3/envs/aiservice" />
diff --git a/django/aiservice/__init__.py b/django/aiservice/__init__.py
deleted file mode 100644
index 9db25d434..000000000
--- a/django/aiservice/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# required for the django test collector to find tests in tests/
diff --git a/django/aiservice/aiservice/asgi.py b/django/aiservice/aiservice/asgi.py
index 354b6c3d6..e7fc7bd55 100644
--- a/django/aiservice/aiservice/asgi.py
+++ b/django/aiservice/aiservice/asgi.py
@@ -10,6 +10,6 @@ import os
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "aiservice.settings")
 
 application = get_asgi_application()
diff --git a/django/aiservice/settings.py b/django/aiservice/aiservice/settings.py
similarity index 99%
rename from django/aiservice/settings.py
rename to django/aiservice/aiservice/settings.py
index f435c5ddc..1300a3f88 100644
--- a/django/aiservice/settings.py
+++ b/django/aiservice/aiservice/settings.py
@@ -64,7 +64,7 @@ MIDDLEWARE: list[str] = [
     "aiservice.middleware.healthcheck.HealthCheckMiddleware",
 ]
 
-ROOT_URLCONF: str = "urls"
+ROOT_URLCONF: str = "aiservice.urls"
 
 TEMPLATES: list[str] = []
 
diff --git a/django/aiservice/tests/test_settings.py b/django/aiservice/aiservice/test_settings.py
similarity index 100%
rename from django/aiservice/tests/test_settings.py
rename to django/aiservice/aiservice/test_settings.py
diff --git a/django/aiservice/tests/__init__.py b/django/aiservice/aiservice/tests/__init__.py
similarity index 100%
rename from django/aiservice/tests/__init__.py
rename to django/aiservice/aiservice/tests/__init__.py
diff --git a/django/aiservice/tests/test_misc.py b/django/aiservice/aiservice/tests/test_misc.py
similarity index 100%
rename from django/aiservice/tests/test_misc.py
rename to django/aiservice/aiservice/tests/test_misc.py
diff --git a/django/aiservice/urls.py b/django/aiservice/aiservice/urls.py
similarity index 96%
rename from django/aiservice/urls.py
rename to django/aiservice/aiservice/urls.py
index a56763675..c3c1d2820 100644
--- a/django/aiservice/urls.py
+++ b/django/aiservice/aiservice/urls.py
@@ -18,14 +18,12 @@ Including another URLconf
 """
 
 # from django.contrib import admin
-
-# from django.contrib import admin
-from django.urls import path
-
 from log_features.log_features import features_api
 from optimizer.optimizer import optimize_api
 from testgen.testgen import testgen_api
 
+from django.urls import path
+
 urlpatterns = [
     path("ai/optimize", optimize_api.urls),
     path("ai/testgen", testgen_api.urls),
diff --git a/django/aiservice/aiservice/wsgi.py b/django/aiservice/aiservice/wsgi.py
index d95a16545..bde021e51 100644
--- a/django/aiservice/aiservice/wsgi.py
+++ b/django/aiservice/aiservice/wsgi.py
@@ -10,6 +10,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "aiservice.settings")
 
 application = get_wsgi_application()
diff --git a/django/aiservice/manage.py b/django/aiservice/manage.py
index 3a2210e34..b3d89b90d 100755
--- a/django/aiservice/manage.py
+++ b/django/aiservice/manage.py
@@ -11,7 +11,7 @@ from aiservice.env_specific import load_env, set_logging_level
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "aiservice.settings")
     # Get the network name of the machine
     machine_id = platform.node()
     try:
diff --git a/django/aiservice/optimizer/tests/__init__.py b/django/aiservice/optimizer/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/django/aiservice/tests/test_optimizer.py b/django/aiservice/optimizer/tests/test_optimizer.py
similarity index 100%
rename from django/aiservice/tests/test_optimizer.py
rename to django/aiservice/optimizer/tests/test_optimizer.py
diff --git a/django/aiservice/pyproject.toml b/django/aiservice/pyproject.toml
index da35efed3..28188809d 100644
--- a/django/aiservice/pyproject.toml
+++ b/django/aiservice/pyproject.toml
@@ -31,6 +31,7 @@ gitpython = "^3.1.43"
 ruff = "^0.4.6"
 ruff-lsp = "^0.0.53"
 returns = "^0.22.0"
+pytest-django = "^4.8.0"
 
 [tool.poetry.group.dev]
 optional = true
diff --git a/django/aiservice/pytest.ini b/django/aiservice/pytest.ini
new file mode 100644
index 000000000..dffbb5474
--- /dev/null
+++ b/django/aiservice/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+DJANGO_SETTINGS_MODULE = aiservice.settings
\ No newline at end of file
diff --git a/django/aiservice/tests/test_perf_injector.py b/django/aiservice/testgen/tests/test_perf_injector.py
similarity index 96%
rename from django/aiservice/tests/test_perf_injector.py
rename to django/aiservice/testgen/tests/test_perf_injector.py
index 13b92536c..e2c2f8ae0 100644
--- a/django/aiservice/tests/test_perf_injector.py
+++ b/django/aiservice/testgen/tests/test_perf_injector.py
@@ -2,6 +2,7 @@ import ast
 import os
 
 from aiservice.models.functions_to_optimize import FunctionParent, FunctionToOptimize
+
 from testgen.instrumentation.instrument_new_tests import InjectPerfAndLogging
 
 os.environ["CODEFLASH_API_KEY"] = "cf-test-key"
@@ -21,7 +22,9 @@ def test_InjectPerfAndLogging_with():
         parents=[FunctionParent(name="HDBSCAN", type="ClassDef")],
     )
     new_module_node = InjectPerfAndLogging(
-        function_to_optimize, auxillary_functions, test_module_path,
+        function_to_optimize,
+        auxillary_functions,
+        test_module_path,
     ).visit(module_node)
 
     expected = """def test_relative_validity_no_tree():
@@ -47,7 +50,9 @@ def test_InjectPerfAndLogging():
         parents=[FunctionParent(name="HDBSCAN", type="ClassDef")],
     )
     new_module_node = InjectPerfAndLogging(
-        function_to_optimize, auxillary_functions, test_module_path,
+        function_to_optimize,
+        auxillary_functions,
+        test_module_path,
     ).visit(module_node)
     expected = """def test_relative_validity_no_tree():
     hdbscan = HDBSCAN()
@@ -73,7 +78,9 @@ def test_remove_bad_assert():
         parents=[FunctionParent(name="HDBSCAN", type="ClassDef")],
     )
     new_module_node = InjectPerfAndLogging(
-        function_to_optimize, auxillary_functions, test_module_path,
+        function_to_optimize,
+        auxillary_functions,
+        test_module_path,
     ).visit(module_node)
     expected = """def test_relative_validity_no_tree():
     hdbscan = HDBSCAN()
@@ -91,13 +98,17 @@ def test_translate_word_starting_with_single_consonant():
     assert translate('banana') == 'ananabay'"""
 
     function_to_optimize = FunctionToOptimize(
-        function_name="translate", file_path="/tmp/path", parents=[],
+        function_name="translate",
+        file_path="/tmp/path",
+        parents=[],
     )
     auxillary_functions = []
     module_node = ast.parse(code)
     test_module_path = "code_to_optimize_path"
     new_module_node = InjectPerfAndLogging(
-        function_to_optimize, auxillary_functions, test_module_path,
+        function_to_optimize,
+        auxillary_functions,
+        test_module_path,
     ).visit(module_node)
     expected = """def test_translate_word_starting_with_vowel():
     _call__bound__arguments = inspect.signature(translate).bind('apple')
@@ -283,9 +294,13 @@ if __name__ == '__main__':
     module_node = ast.parse(code)
     test_module_path = "code_to_optimize_path"
     function_to_optimize = FunctionToOptimize(
-        function_name="sorter", file_path="/tmp/path", parents=[],
+        function_name="sorter",
+        file_path="/tmp/path",
+        parents=[],
     )
     new_module_node = InjectPerfAndLogging(
-        function_to_optimize, auxillary_functions, test_module_path,
+        function_to_optimize,
+        auxillary_functions,
+        test_module_path,
     ).visit(module_node)
     assert ast.unparse(new_module_node).strip("\n") == expected
diff --git a/django/aiservice/tests/test_testgen.py b/django/aiservice/testgen/tests/test_testgen.py
similarity index 100%
rename from django/aiservice/tests/test_testgen.py
rename to django/aiservice/testgen/tests/test_testgen.py