diff --git a/fsfw b/fsfw
index 904ae2cc..03fa77e2 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 904ae2cc0ef61706a385d498942154da4f923a18
+Subproject commit 03fa77e2b305d66b65d6db8f1181972b7b2643d2
diff --git a/linux/ObjectFactory.h b/linux/ObjectFactory.h
index 668917e7..a592e818 100644
--- a/linux/ObjectFactory.h
+++ b/linux/ObjectFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h>
+#include <fsfw_hal/linux/gpio/LinuxLibgpioIF.h>
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
 
 #include <string>
diff --git a/mission/controller/AcsController.cpp b/mission/controller/AcsController.cpp
new file mode 100644
index 00000000..d6ca9fdd
--- /dev/null
+++ b/mission/controller/AcsController.cpp
@@ -0,0 +1,10 @@
+/*
+ * AcsController.cpp
+ *
+ *  Created on: Aug 12, 2022
+ *      Author: rmueller
+ */
+
+
+
+
diff --git a/mission/controller/AcsController.h b/mission/controller/AcsController.h
new file mode 100644
index 00000000..e4e46334
--- /dev/null
+++ b/mission/controller/AcsController.h
@@ -0,0 +1,31 @@
+#ifndef MISSION_CONTROLLER_ACSCONTROLLER_H_
+#define MISSION_CONTROLLER_ACSCONTROLLER_H_
+
+#include <fsfw/controller/ExtendedControllerBase.h>
+
+class AcsController: public ExtendedControllerBase {
+public:
+private:
+
+  ReturnValue_t handleCommandMessage(CommandMessage* message) override;
+  void performControlOperation() override;
+
+
+  ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
+                                                LocalDataPoolManager& poolManager) override;
+  LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override;
+
+  // Mode abstract functions
+  ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode,
+                                         uint32_t* msToReachTheMode) override;
+
+  // MGMs
+
+  // Sun Sensors
+
+
+};
+
+
+
+#endif /* MISSION_CONTROLLER_ACSCONTROLLER_H_ */
diff --git a/tmtc b/tmtc
index 811a553e..e383263d 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 811a553ebeede481ae5ac9d78809593fbba4c5e2
+Subproject commit e383263d2f39c17e432ae51b9a01db8466c34b68