diff --git a/.gitmodules b/.gitmodules
index c4ccc40..37846b3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,3 @@
 [submodule "TACOS/Libs"]
 	path = TACOS/Libs
 	url = ssh://git@git.intern.spaceteamaachen.de:22222/ALPAKA/sta-core.git
-[submodule "Libs/sta-core"]
-	path = Libs/sta-core
-	url = ssh://git@git.intern.spaceteamaachen.de:22222/ALPAKA/sta-core.git
-	branch = adding-events
-[submodule "Libs/rtos2-utils"]
-	path = Libs/rtos2-utils
-	url = ssh://git@git.intern.spaceteamaachen.de:22222/ALPAKA/rtos2-utils.git
-	branch = libs-rework
\ No newline at end of file
diff --git a/Libs/rtos2-utils b/Libs/rtos2-utils
deleted file mode 160000
index b1d6456..0000000
--- a/Libs/rtos2-utils
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b1d6456dd88f881f68674824339483f69dd280f0
diff --git a/Libs/sta-core b/Libs/sta-core
deleted file mode 160000
index c469228..0000000
--- a/Libs/sta-core
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c4692287cf88e518d22078c1d284be343fc82fba
diff --git a/Tacos/include/sta/tacos/manager.hpp b/include/sta/tacos/manager.hpp
similarity index 100%
rename from Tacos/include/sta/tacos/manager.hpp
rename to include/sta/tacos/manager.hpp
diff --git a/Tacos/include/sta/tacos/startup.hpp b/include/sta/tacos/startup.hpp
similarity index 100%
rename from Tacos/include/sta/tacos/startup.hpp
rename to include/sta/tacos/startup.hpp
diff --git a/Tacos/include/sta/tacos/statemachine.hpp b/include/sta/tacos/statemachine.hpp
similarity index 100%
rename from Tacos/include/sta/tacos/statemachine.hpp
rename to include/sta/tacos/statemachine.hpp
diff --git a/Tacos/include/sta/tacos/thread.hpp b/include/sta/tacos/thread.hpp
similarity index 100%
rename from Tacos/include/sta/tacos/thread.hpp
rename to include/sta/tacos/thread.hpp
diff --git a/Tacos/src/manager.cpp b/src/manager.cpp
similarity index 100%
rename from Tacos/src/manager.cpp
rename to src/manager.cpp
diff --git a/Tacos/src/startup.cpp b/src/startup.cpp
similarity index 100%
rename from Tacos/src/startup.cpp
rename to src/startup.cpp
diff --git a/Tacos/src/statemachine.cpp b/src/statemachine.cpp
similarity index 100%
rename from Tacos/src/statemachine.cpp
rename to src/statemachine.cpp
diff --git a/Tacos/src/thread.cpp b/src/thread.cpp
similarity index 100%
rename from Tacos/src/thread.cpp
rename to src/thread.cpp