diff --git a/.gitmodules b/.gitmodules
index 4db1c7e..6218baa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "assignment/projectTestCase"]
-	path = assignment/projectTestCase
+[submodule "data/testcases"]
+	path = data/testcases
 	url = https://github.com/Plyncesilva/DRTS_Project-Test-Cases.git
diff --git a/data/testcases b/data/testcases
new file mode 160000
index 0000000..d255eae
--- /dev/null
+++ b/data/testcases
@@ -0,0 +1 @@
+Subproject commit d255eae14fd7153234d504e2212788a06580efbe
diff --git a/src/__init__.py b/src/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/analysis/__init__.py b/src/analysis/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/analysis/main.py b/src/analysis/main.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/common/__init__.py b/src/common/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/assignment/simulator/src/architecture.py b/src/common/architecture.py
similarity index 100%
rename from assignment/simulator/src/architecture.py
rename to src/common/architecture.py
diff --git a/assignment/simulator/src/budget.py b/src/common/budget.py
similarity index 100%
rename from assignment/simulator/src/budget.py
rename to src/common/budget.py
diff --git a/assignment/simulator/src/scheduler.py b/src/common/scheduler.py
similarity index 100%
rename from assignment/simulator/src/scheduler.py
rename to src/common/scheduler.py
diff --git a/src/simulator/__init__.py b/src/simulator/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/simulator/main.py b/src/simulator/main.py
new file mode 100644
index 0000000..e69de29