diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84ff242..1a8ba36 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,7 @@
 cmake_minimum_required(VERSION 2.6.4)
 project(CFS_SCH C)
 
-include_directories(fsw/public_inc)
-include_directories(fsw/mission_inc)
-include_directories(fsw/platform_inc)
+include_directories(fsw/inc)
 
 aux_source_directory(fsw/src APP_SRC_FILES)
 
diff --git a/fsw/for_build/codewalk_doxy b/fsw/for_build/codewalk_doxy
index da8b885..9174604 100644
--- a/fsw/for_build/codewalk_doxy
+++ b/fsw/for_build/codewalk_doxy
@@ -95,8 +95,7 @@ WARN_LOGFILE           =
 INPUT                  = $(CFS_APP_SRC)/$(APPTARGET)/docs/dox_src/detailed_design/cfs_$(APPTARGET).dox
 #INPUT                 += $(CFS_APP_SRC)/$(APPTARGET)/fsw/public_inc 
 INPUT                 += $(CFS_APP_SRC)/$(APPTARGET)/fsw/src
-INPUT                 += $(CFS_APP_SRC)/$(APPTARGET)/fsw/mission_inc
-INPUT                 += $(CFS_APP_SRC)/$(APPTARGET)/fsw/platform_inc 
+INPUT                 += $(CFS_APP_SRC)/$(APPTARGET)/fsw/inc
 #INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.c \
                          *.h
diff --git a/fsw/for_build/detail_doxy b/fsw/for_build/detail_doxy
index 7e415d8..3d8929b 100644
--- a/fsw/for_build/detail_doxy
+++ b/fsw/for_build/detail_doxy
@@ -94,8 +94,8 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 INPUT                  = $(CFS_APP_SRC)/$(APPTARGET)/docs/dox_src/detailed_design/cfs_$(APPTARGET).dox
 #INPUT                 += $(CFS_APP_SRC)/$(APPTARGET)/fsw/public_inc 
-INPUT                 += ../../mission_inc/$(APPTARGET)_perfids.h 
-#INPUT                 += ../../mission_inc/$(APPTARGET)_mission_cfg.h
+INPUT                 += ../../inc/$(APPTARGET)_perfids.h 
+#INPUT                 += ../../inc/$(APPTARGET)_mission_cfg.h
 INPUT                 += ../inc/$(APPTARGET)_msgids.h 
 INPUT                 += ../inc/$(APPTARGET)_platform_cfg.h
 INPUT                 += $(CFS_APP_SRC)/$(APPTARGET)/fsw/src 
diff --git a/fsw/for_build/user_doxy b/fsw/for_build/user_doxy
index 428835a..9d82e13 100644
--- a/fsw/for_build/user_doxy
+++ b/fsw/for_build/user_doxy
@@ -101,7 +101,7 @@ INPUT                 += $(CFS_APP_SRC)/$(APPTARGET)/fsw/src/$(APPTARGET)_events
 INPUT                 += $(CFS_APP_SRC)/$(APPTARGET)/fsw/src/$(APPTARGET)_custom.h 
 INPUT                 += $(CFS_APP_SRC)/$(APPTARGET)/fsw/src/$(APPTARGET)_custom.c 
 INPUT                 += $(CFS_APP_SRC)/inc/$(APPTARGET)_api.h 
-INPUT                 += ../../mission_inc/$(APPTARGET)_perfids.h 
+INPUT                 += ../../inc/$(APPTARGET)_perfids.h 
 #INPUT                 += ../../mission_inc/$(APPTARGET)_mission_cfg.h
 INPUT                 += ../inc/$(APPTARGET)_msgids.h 
 INPUT                 += ../inc/$(APPTARGET)_platform_cfg.h 
diff --git a/fsw/public_inc/sch_api.h b/fsw/inc/sch_api.h
similarity index 100%
rename from fsw/public_inc/sch_api.h
rename to fsw/inc/sch_api.h
diff --git a/fsw/src/sch_events.h b/fsw/inc/sch_events.h
similarity index 100%
rename from fsw/src/sch_events.h
rename to fsw/inc/sch_events.h
diff --git a/fsw/src/sch_msg.h b/fsw/inc/sch_msg.h
similarity index 100%
rename from fsw/src/sch_msg.h
rename to fsw/inc/sch_msg.h
diff --git a/fsw/src/sch_msgdefs.h b/fsw/inc/sch_msgdefs.h
similarity index 100%
rename from fsw/src/sch_msgdefs.h
rename to fsw/inc/sch_msgdefs.h
diff --git a/fsw/platform_inc/sch_msgids.h b/fsw/inc/sch_msgids.h
similarity index 100%
rename from fsw/platform_inc/sch_msgids.h
rename to fsw/inc/sch_msgids.h
diff --git a/fsw/mission_inc/sch_perfids.h b/fsw/inc/sch_perfids.h
similarity index 100%
rename from fsw/mission_inc/sch_perfids.h
rename to fsw/inc/sch_perfids.h
diff --git a/fsw/platform_inc/sch_platform_cfg.h b/fsw/inc/sch_platform_cfg.h
similarity index 100%
rename from fsw/platform_inc/sch_platform_cfg.h
rename to fsw/inc/sch_platform_cfg.h
diff --git a/fsw/src/sch_tbldefs.h b/fsw/inc/sch_tbldefs.h
similarity index 100%
rename from fsw/src/sch_tbldefs.h
rename to fsw/inc/sch_tbldefs.h
diff --git a/fsw/unit_test/makefile b/fsw/unit_test/makefile
index 00c362b..89b8864 100644
--- a/fsw/unit_test/makefile
+++ b/fsw/unit_test/makefile
@@ -57,9 +57,7 @@ INCLUDES += -I$(PSP_DIR)/fsw/inc
 INCLUDES += -I$(PSP_DIR)/fsw/pc-linux/inc
 INCLUDES += -I$(PSP_DIR)/fsw/pc-linux/inc
 INCLUDES += -I$(SCH_PATH)/fsw/src
-INCLUDES += -I$(SCH_PATH)/fsw/mission_inc
-INCLUDES += -I$(SCH_PATH)/fsw/platform_inc
-INCLUDES += -I$(SCH_PATH)/fsw/public_inc
+INCLUDES += -I$(SCH_PATH)/fsw/inc
 
 #
 # FLIGHT_OBJS specifies flight software object files.