diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ef375d..33cb96d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,10 @@
 cmake_minimum_required(VERSION 3.5)
 project(CFS_SCH_LAB C)
 
-include_directories(fsw/mission_inc)
-include_directories(fsw/platform_inc)
-include_directories(${ci_lab_MISSION_DIR}/fsw/platform_inc)
-include_directories(${to_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(${to_lab_MISSION_DIR}/fsw/inc)
+include_directories(${sample_app_MISSION_DIR}/fsw/inc)
 
 # Create the app module
 add_cfe_app(sch_lab fsw/src/sch_lab_app.c)
diff --git a/README.md b/README.md
index a1094a9..b0ec5f2 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ This lab application is a non-flight packet scheduler application for the cFS Bu
 
 sch_lab is a simple packet scheduler application with a one second resolution.
 
-To change the list of packets that sch_lab sends out, edit the schedule table located in the platform include file: fsw/platform_inc/sch_lab_sched_tab.h
+To change the list of packets that sch_lab sends out, edit the schedule table located in the tables directory: fsw/tables/sch_lab_table.c
 
 ## Known issues
 
diff --git a/fsw/mission_inc/sch_lab_perfids.h b/fsw/inc/sch_lab_perfids.h
similarity index 100%
rename from fsw/mission_inc/sch_lab_perfids.h
rename to fsw/inc/sch_lab_perfids.h
diff --git a/fsw/platform_inc/sch_lab_table.h b/fsw/inc/sch_lab_table.h
similarity index 100%
rename from fsw/platform_inc/sch_lab_table.h
rename to fsw/inc/sch_lab_table.h