diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48e365d..c4bb448 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_subdirectory(mission)
 add_subdirectory(test)
-add_subdirectory(common)
+add_subdirectory(config)
+add_subdirectory(utility)
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
deleted file mode 100644
index 40f33d4..0000000
--- a/common/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_subdirectory(config)
-add_subdirectory(utility)
-
diff --git a/common/config/CMakeLists.txt b/config/CMakeLists.txt
similarity index 100%
rename from common/config/CMakeLists.txt
rename to config/CMakeLists.txt
diff --git a/common/config/OBSWVersion.h b/config/OBSWVersion.h
similarity index 100%
rename from common/config/OBSWVersion.h
rename to config/OBSWVersion.h
diff --git a/common/config/commonClassIds.h b/config/commonClassIds.h
similarity index 100%
rename from common/config/commonClassIds.h
rename to config/commonClassIds.h
diff --git a/common/config/commonConfig.h.in b/config/commonConfig.h.in
similarity index 100%
rename from common/config/commonConfig.h.in
rename to config/commonConfig.h.in
diff --git a/common/config/commonPollingSequenceFactory.cpp b/config/commonPollingSequenceFactory.cpp
similarity index 100%
rename from common/config/commonPollingSequenceFactory.cpp
rename to config/commonPollingSequenceFactory.cpp
diff --git a/common/config/commonSubsystemIds.h b/config/commonSubsystemIds.h
similarity index 100%
rename from common/config/commonSubsystemIds.h
rename to config/commonSubsystemIds.h
diff --git a/common/config/commonSystemObjects.h b/config/commonSystemObjects.h
similarity index 100%
rename from common/config/commonSystemObjects.h
rename to config/commonSystemObjects.h
diff --git a/common/utility/CMakeLists.txt b/utility/CMakeLists.txt
similarity index 100%
rename from common/utility/CMakeLists.txt
rename to utility/CMakeLists.txt
diff --git a/common/utility/utility.cpp b/utility/utility.cpp
similarity index 100%
rename from common/utility/utility.cpp
rename to utility/utility.cpp
diff --git a/common/utility/utility.h b/utility/utility.h
similarity index 100%
rename from common/utility/utility.h
rename to utility/utility.h