diff --git a/.github/workflows/TMS.yml b/.github/workflows/TMS.yml
index 9da10a8..43c02f1 100644
--- a/.github/workflows/TMS.yml
+++ b/.github/workflows/TMS.yml
@@ -2,15 +2,12 @@ name: "TMS Builds"
 
 on:
   push:
-    paths:
-      - '**'
-      - '!**/.gitignore'
+    branches:
+      - main
   pull_request:
     paths:
       - '**'
       - '!**/.gitignore'
-    branches:
-      - main
   workflow_dispatch:
 
 concurrency:
diff --git a/tactical-microgrid-standard/CMakeLists.txt b/tactical-microgrid-standard/CMakeLists.txt
index 26d7d1d..8195db7 100644
--- a/tactical-microgrid-standard/CMakeLists.txt
+++ b/tactical-microgrid-standard/CMakeLists.txt
@@ -15,7 +15,7 @@ add_library(Common
 target_include_directories(Common PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 opendds_target_sources(Common
   PUBLIC
-    idl/mil-std-3071_data_model.idl
+    common/mil-std-3071_data_model.idl
   INCLUDE_BASE ${CMAKE_CURRENT_SOURCE_DIR}
   OPENDDS_IDL_OPTIONS -Lc++11
   USE_EXPORT "common/opendds_tms_export.h" OpenDDS_TMS_Export
diff --git a/tactical-microgrid-standard/cli/CLI.mpc b/tactical-microgrid-standard/cli/CLI.mpc
deleted file mode 100644
index 6cae6ea..0000000
--- a/tactical-microgrid-standard/cli/CLI.mpc
+++ /dev/null
@@ -1,7 +0,0 @@
-project: dcps_rtps_udp, opendds_uses_cxx17 {
-  after += Commands_Idl
-  exename = cli
-  includes += ..
-  libpaths += ../idl ../common ../cli_idl
-  libs += tms Commands_Idl Common
-}
diff --git a/tactical-microgrid-standard/cli_idl/CLICommands.idl b/tactical-microgrid-standard/cli_idl/CLICommands.idl
index e844abc..a68629d 100644
--- a/tactical-microgrid-standard/cli_idl/CLICommands.idl
+++ b/tactical-microgrid-standard/cli_idl/CLICommands.idl
@@ -1,4 +1,4 @@
-#include "idl/mil-std-3071_data_model.idl"
+#include "common/mil-std-3071_data_model.idl"
 
 module cli {
 
diff --git a/tactical-microgrid-standard/cli_idl/CLICommands.mpc b/tactical-microgrid-standard/cli_idl/CLICommands.mpc
deleted file mode 100644
index 4499d09..0000000
--- a/tactical-microgrid-standard/cli_idl/CLICommands.mpc
+++ /dev/null
@@ -1,15 +0,0 @@
-project: dcps_idl_only_lib, opendds_cxx11 {
-  sharedname = Commands_Idl
-  includes += ..
-  libpaths += ../idl
-  libs += tms
-  idlflags += -I..
-  dcps_ts_flags += -I..
-
-  Typesupport_Files {
-    CLICommands.idl
-  }
-
-  IDL_Files {
-  }
-}
diff --git a/tactical-microgrid-standard/common/Common.mpc b/tactical-microgrid-standard/common/Common.mpc
deleted file mode 100644
index 90d0d00..0000000
--- a/tactical-microgrid-standard/common/Common.mpc
+++ /dev/null
@@ -1,13 +0,0 @@
-project: opendds_cxx11 {
-  includes += ..
-  libpaths += ../idl
-  libs += tms
-  after += tms
-
-  Source_Files {
-    Handshaking.cpp
-    DeviceInfoDataReaderListenerImpl.cpp
-    HeartbeatDataReaderListenerImpl.cpp
-    QosHelper.cpp
-  }
-}
diff --git a/tactical-microgrid-standard/common/DeviceInfoDataReaderListenerImpl.cpp b/tactical-microgrid-standard/common/DeviceInfoDataReaderListenerImpl.cpp
index bdf4ddd..f9c4a56 100644
--- a/tactical-microgrid-standard/common/DeviceInfoDataReaderListenerImpl.cpp
+++ b/tactical-microgrid-standard/common/DeviceInfoDataReaderListenerImpl.cpp
@@ -1,4 +1,4 @@
-#include "idl/mil-std-3071_data_modelTypeSupportImpl.h"
+#include "common/mil-std-3071_data_modelTypeSupportImpl.h"
 #include "DeviceInfoDataReaderListenerImpl.h"
 
 void DeviceInfoDataReaderListenerImpl::on_data_available(DDS::DataReader_ptr reader)
diff --git a/tactical-microgrid-standard/common/Handshaking.h b/tactical-microgrid-standard/common/Handshaking.h
index 254f91b..0e891da 100644
--- a/tactical-microgrid-standard/common/Handshaking.h
+++ b/tactical-microgrid-standard/common/Handshaking.h
@@ -2,10 +2,9 @@
 #define HANDSHAKING_H
 
 #include "TimerHandler.h"
+#include "common/mil-std-3071_data_modelTypeSupportImpl.h"
 #include "opendds_tms_export.h"
 
-#include <idl/mil-std-3071_data_modelTypeSupportImpl.h>
-
 #include <dds/DCPS/Service_Participant.h>
 
 #include <functional>
diff --git a/tactical-microgrid-standard/common/HeartbeatDataReaderListenerImpl.cpp b/tactical-microgrid-standard/common/HeartbeatDataReaderListenerImpl.cpp
index b5bead9..f283cbb 100644
--- a/tactical-microgrid-standard/common/HeartbeatDataReaderListenerImpl.cpp
+++ b/tactical-microgrid-standard/common/HeartbeatDataReaderListenerImpl.cpp
@@ -1,4 +1,4 @@
-#include "idl/mil-std-3071_data_modelTypeSupportImpl.h"
+#include "common/mil-std-3071_data_modelTypeSupportImpl.h"
 #include "HeartbeatDataReaderListenerImpl.h"
 
 void HeartbeatDataReaderListenerImpl::on_data_available(DDS::DataReader_ptr reader)
diff --git a/tactical-microgrid-standard/common/QosHelper.h b/tactical-microgrid-standard/common/QosHelper.h
index 5012ab1..6c85f60 100644
--- a/tactical-microgrid-standard/common/QosHelper.h
+++ b/tactical-microgrid-standard/common/QosHelper.h
@@ -1,7 +1,7 @@
 #ifndef QOS_HELPER_H
 #define QOS_HELPER_H
 
-#include "idl/mil-std-3071_data_modelTypeSupportImpl.h"
+#include "common/mil-std-3071_data_modelTypeSupportImpl.h"
 
 #include <dds/DdsDcpsCoreC.h>
 
diff --git a/tactical-microgrid-standard/idl/mil-std-3071_data_model.idl b/tactical-microgrid-standard/common/mil-std-3071_data_model.idl
similarity index 100%
rename from tactical-microgrid-standard/idl/mil-std-3071_data_model.idl
rename to tactical-microgrid-standard/common/mil-std-3071_data_model.idl
diff --git a/tactical-microgrid-standard/controller/Common.h b/tactical-microgrid-standard/controller/Common.h
index ad3403d..b211ce8 100644
--- a/tactical-microgrid-standard/controller/Common.h
+++ b/tactical-microgrid-standard/controller/Common.h
@@ -1,7 +1,7 @@
 #ifndef CONTROLLER_COMMON_H
 #define CONTROLLER_COMMON_H
 
-#include "idl/mil-std-3071_data_modelTypeSupportImpl.h"
+#include "common/mil-std-3071_data_modelTypeSupportImpl.h"
 
 #include <dds/DCPS/optional.h>
 
diff --git a/tactical-microgrid-standard/controller/Controller.mpc b/tactical-microgrid-standard/controller/Controller.mpc
deleted file mode 100644
index efb8260..0000000
--- a/tactical-microgrid-standard/controller/Controller.mpc
+++ /dev/null
@@ -1,7 +0,0 @@
-project: dcps_rtps_udp, opendds_uses_cxx17 {
-  after += Commands_Idl
-  exename = controller
-  includes += ..
-  libpaths += ../idl ../common ../cli_idl
-  libs += tms Commands_Idl Common
-}
diff --git a/tactical-microgrid-standard/idl/tms.mpc b/tactical-microgrid-standard/idl/tms.mpc
deleted file mode 100644
index 494a93f..0000000
--- a/tactical-microgrid-standard/idl/tms.mpc
+++ /dev/null
@@ -1,7 +0,0 @@
-project: opendds_cxx11, msvc_bigobj {
-
-  Typesupport_Files {
-    mil-std-3071_data_model.idl
-  }
-
-}