diff --git a/CMakeLists.txt b/CMakeLists.txt
index 803ee01..c07f4d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,10 +4,9 @@ project(CFS_TO_LAB C)
 # Include source directory for table use
 include_directories(fsw/src)
 
-include_directories(fsw/mission_inc)
-include_directories(fsw/platform_inc)
-include_directories(${ci_lab_MISSION_DIR}/fsw/platform_inc)
-include_directories(${sample_app_MISSION_DIR}/fsw/platform_inc)
+include_directories(fsw/inc)
+include_directories(${ci_lab_MISSION_DIR}/fsw/inc)
+include_directories(${sample_app_MISSION_DIR}/fsw/inc)
 
 aux_source_directory(fsw/src APP_SRC_FILES)
 
diff --git a/fsw/src/to_lab_events.h b/fsw/inc/to_lab_events.h
similarity index 100%
rename from fsw/src/to_lab_events.h
rename to fsw/inc/to_lab_events.h
diff --git a/fsw/src/to_lab_msg.h b/fsw/inc/to_lab_msg.h
similarity index 100%
rename from fsw/src/to_lab_msg.h
rename to fsw/inc/to_lab_msg.h
diff --git a/fsw/platform_inc/to_lab_msgids.h b/fsw/inc/to_lab_msgids.h
similarity index 100%
rename from fsw/platform_inc/to_lab_msgids.h
rename to fsw/inc/to_lab_msgids.h
diff --git a/fsw/mission_inc/to_lab_perfids.h b/fsw/inc/to_lab_perfids.h
similarity index 100%
rename from fsw/mission_inc/to_lab_perfids.h
rename to fsw/inc/to_lab_perfids.h
diff --git a/fsw/platform_inc/to_lab_sub_table.h b/fsw/inc/to_lab_sub_table.h
similarity index 100%
rename from fsw/platform_inc/to_lab_sub_table.h
rename to fsw/inc/to_lab_sub_table.h