diff --git a/.gitmodules b/.gitmodules
index 61a3d97..2cd9f0c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,8 +2,14 @@
 	path = fsfw
 	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw.git
 [submodule "fsfw-example-common"]
-	path = fsfw-example-common
+	path = example_common
 	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw-example-common.git
 [submodule "tmtc/tmtccmd"]
 	path = tmtc/tmtccmd
 	url = https://github.com/spacefisch/tmtccmd.git
+[submodule "tmtc/common_tmtc"]
+	path = tmtc/common_tmtc
+	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw-example-tmtc-common.git
+[submodule "generators/fsfwgen"]
+	path = generators/fsfwgen
+	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw-gen.git
diff --git a/fsfw-example-common b/example_common
similarity index 100%
rename from fsfw-example-common
rename to example_common
diff --git a/generators/fsfwgen b/generators/fsfwgen
new file mode 160000
index 0000000..e6f5ff1
--- /dev/null
+++ b/generators/fsfwgen
@@ -0,0 +1 @@
+Subproject commit e6f5ff18129984b591a6a286968b1ace42c278b2
diff --git a/tmtc/common_tmtc b/tmtc/common_tmtc
new file mode 160000
index 0000000..a31a9d3
--- /dev/null
+++ b/tmtc/common_tmtc
@@ -0,0 +1 @@
+Subproject commit a31a9d39257d545a1a35752f35d7d1bfcf1b2c49