diff --git a/devicehandlers/DeviceCommunicationIF.h b/devicehandlers/DeviceCommunicationIF.h
index ca0e9fe2..06c228f7 100644
--- a/devicehandlers/DeviceCommunicationIF.h
+++ b/devicehandlers/DeviceCommunicationIF.h
@@ -3,6 +3,10 @@
 
 #include <framework/devicehandlers/Cookie.h>
 #include <framework/returnvalues/HasReturnvaluesIF.h>
+/**
+ * @defgroup interfaces Interfaces
+ * @brief Communication interfaces for flight software objects
+ */
 
 /**
  * @brief This is an interface to decouple device communication from
diff --git a/subsystem/SubsystemBase.h b/subsystem/SubsystemBase.h
index 3294c46d..1a050a9a 100644
--- a/subsystem/SubsystemBase.h
+++ b/subsystem/SubsystemBase.h
@@ -12,6 +12,10 @@
 #include <framework/ipc/MessageQueueIF.h>
 #include <map>
 
+/**
+ * @defgroup subsystems Subsystem Objects
+ * Contains all Subsystem and Assemblies
+ */
 class SubsystemBase: public SystemObject,
 		public HasModesIF,
 		public HasHealthIF,