diff --git a/.gitmodules b/.gitmodules
index 2ed4068..ae88377 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "PID"]
 	path = PID
 	url = https://github.com/Carsten1987/PID.git
+[submodule "CLI"]
+	path = CLI
+	url = http://gitea.keller/carsten/CLI.git
+[submodule "Trace"]
+	path = Trace
+	url = http://gitea.keller/carsten/Trace.git
diff --git a/CLI b/CLI
new file mode 160000
index 0000000..125519a
--- /dev/null
+++ b/CLI
@@ -0,0 +1 @@
+Subproject commit 125519a806df14ec911c6b2fe7d6a6fc47f98b94
diff --git a/Source/CLI_Config.h b/Source/CLI_Config.h
new file mode 100644
index 0000000..8973087
--- /dev/null
+++ b/Source/CLI_Config.h
@@ -0,0 +1,21 @@
+/*
+ * CLI_config.h
+ *
+ *  Created on: 24.02.2016
+ *      Author: Carsten
+ */
+
+#ifndef TESTS_TEST_CLI_CONFIG_H_
+#define TESTS_TEST_CLI_CONFIG_H_
+
+#define CLI_OUTPUT_BUFFER_SIZE 50u
+
+#define CLI_INPUT_BUFFER_SIZE 30u
+
+#define CLI_MAXIMAL_ARGUMENT_COUNT 5u
+
+#define CLI_PROMT "Elektronische Last>"
+
+#define NO_TASK
+
+#endif /* DEBUG_TESTS_TEST_CLI_CONFIG_H_ */
diff --git a/Trace b/Trace
new file mode 160000
index 0000000..acd62e4
--- /dev/null
+++ b/Trace
@@ -0,0 +1 @@
+Subproject commit acd62e4605978091fffa1d2c664e253e481eaf48