diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd1d332..892ee33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,6 @@
 project(CFE_SAMPLE_APP C)
 
-include_directories(fsw/mission_inc)
-include_directories(fsw/platform_inc)
+include_directories(fsw/inc)
 
 # Create the app module
 add_cfe_app(sample_app fsw/src/sample_app.c)
diff --git a/fsw/src/sample_app_events.h b/fsw/inc/sample_app_events.h
similarity index 100%
rename from fsw/src/sample_app_events.h
rename to fsw/inc/sample_app_events.h
diff --git a/fsw/src/sample_app_msg.h b/fsw/inc/sample_app_msg.h
similarity index 100%
rename from fsw/src/sample_app_msg.h
rename to fsw/inc/sample_app_msg.h
diff --git a/fsw/platform_inc/sample_app_msgids.h b/fsw/inc/sample_app_msgids.h
similarity index 100%
rename from fsw/platform_inc/sample_app_msgids.h
rename to fsw/inc/sample_app_msgids.h
diff --git a/fsw/mission_inc/sample_app_perfids.h b/fsw/inc/sample_app_perfids.h
similarity index 100%
rename from fsw/mission_inc/sample_app_perfids.h
rename to fsw/inc/sample_app_perfids.h
diff --git a/fsw/platform_inc/sample_app_table.h b/fsw/inc/sample_app_table.h
similarity index 100%
rename from fsw/platform_inc/sample_app_table.h
rename to fsw/inc/sample_app_table.h