diff --git a/fsw/cfe-core/src/msg/CMakeLists.txt b/fsw/cfe-core/src/msg/CMakeLists.txt
index dbb801f28..3e39e0672 100644
--- a/fsw/cfe-core/src/msg/CMakeLists.txt
+++ b/fsw/cfe-core/src/msg/CMakeLists.txt
@@ -14,9 +14,13 @@
 ##################################################################
 
 # Add the basic set of files which are always built
-set(CFE_ALL_MODULE_SRCS ${CFE_ALL_MODULE_SRCS}
-    ${CMAKE_CURRENT_SOURCE_DIR}/cfe_msg_checksum.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/cfe_msg_fc.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/cfe_msg_time.c
-    PARENT_SCOPE
+set(MODULE_SRCS
+    src/cfe_msg_checksum.c
+    src/cfe_msg_fc.c
+    src/cfe_msg_time.c
 )
+
+add_library(${MODULE_NAME} STATIC ${MODULE_SRCS})
+
+# Add to includes for header dependency resolution across modules
+target_include_directories(${MODULE_NAME} PUBLIC inc)
diff --git a/fsw/cfe-core/src/inc/cfe_msg.h b/fsw/cfe-core/src/msg/inc/cfe_msg.h
similarity index 98%
rename from fsw/cfe-core/src/inc/cfe_msg.h
rename to fsw/cfe-core/src/msg/inc/cfe_msg.h
index 965d68380..028b9f4d4 100644
--- a/fsw/cfe-core/src/inc/cfe_msg.h
+++ b/fsw/cfe-core/src/msg/inc/cfe_msg.h
@@ -105,7 +105,7 @@ void CFE_MSG_GenerateChecksum(CFE_SB_MsgPtr_t MsgPtr);
 bool CFE_MSG_ValidateChecksum(CFE_SB_MsgPtr_t MsgPtr);
 /**@}*/
 
-/** @defgropu CFEAPIMSGCmdCode cFE Message Command Code APIs
+/** @defgroup CFEAPIMSGCmdCode cFE Message Command Code APIs
  * @{
  */
 
@@ -158,7 +158,7 @@ uint16 CFE_MSG_GetCmdCode(CFE_SB_MsgPtr_t MsgPtr);
 
 /**@}*/
 
-/** @defgropu CFEAPIMSGTime cFE Message Time APIs
+/** @defgroup CFEAPIMSGTime cFE Message Time APIs
  * @{
  */
 
diff --git a/fsw/cfe-core/src/msg/cfe_msg_checksum.c b/fsw/cfe-core/src/msg/src/cfe_msg_checksum.c
similarity index 100%
rename from fsw/cfe-core/src/msg/cfe_msg_checksum.c
rename to fsw/cfe-core/src/msg/src/cfe_msg_checksum.c
diff --git a/fsw/cfe-core/src/msg/cfe_msg_fc.c b/fsw/cfe-core/src/msg/src/cfe_msg_fc.c
similarity index 100%
rename from fsw/cfe-core/src/msg/cfe_msg_fc.c
rename to fsw/cfe-core/src/msg/src/cfe_msg_fc.c
diff --git a/fsw/cfe-core/src/msg/cfe_msg_time.c b/fsw/cfe-core/src/msg/src/cfe_msg_time.c
similarity index 100%
rename from fsw/cfe-core/src/msg/cfe_msg_time.c
rename to fsw/cfe-core/src/msg/src/cfe_msg_time.c