Index: lib/MsgUtils/cmake/MsgUtils.cmake
===================================================================
diff -u -rfa691c15183dfe8596de699ef8c3a7fcdb90edab -r0bbdafc836463652c41d839ba652e77775a43bec
--- lib/MsgUtils/cmake/MsgUtils.cmake	(.../MsgUtils.cmake)	(revision fa691c15183dfe8596de699ef8c3a7fcdb90edab)
+++ lib/MsgUtils/cmake/MsgUtils.cmake	(.../MsgUtils.cmake)	(revision 0bbdafc836463652c41d839ba652e77775a43bec)
@@ -27,11 +27,11 @@
 
     add_custom_command(
         DEPENDS
-            ${MSGUTILS_SCRIPTS_DIR}/MsgData.py
-            ${MSGUTILS_SCRIPTS_DIR}/MsgCpp.py
+            ${MSGUTILS_SCRIPTS_DIR}/msgutils/MsgData.py
+            ${MSGUTILS_SCRIPTS_DIR}/msgutils/MsgCpp.py
             ${MSGUTILS_SCRIPTS_DIR}/GenerateMsgDefsCpp.py
-            ${MSGUTILS_SCRIPTS_DIR}/templates/MsgDefs_h.jinja
-            ${MSGUTILS_SCRIPTS_DIR}/templates/MsgDefs_cpp.jinja
+            ${MSGUTILS_SCRIPTS_DIR}/msgutils/templates/MsgDefs_h.jinja
+            ${MSGUTILS_SCRIPTS_DIR}/msgutils/templates/MsgDefs_cpp.jinja
             ${${_input_confs}}
         OUTPUT
             ${_header_path}
@@ -71,10 +71,10 @@
 
     add_custom_command(
         DEPENDS
-            ${MSGUTILS_SCRIPTS_DIR}/MsgData.py
-            ${MSGUTILS_SCRIPTS_DIR}/MsgProtobuf.py
+            ${MSGUTILS_SCRIPTS_DIR}/msgutils/MsgData.py
+            ${MSGUTILS_SCRIPTS_DIR}/msgutils/MsgProtobuf.py
             ${MSGUTILS_SCRIPTS_DIR}/GenerateProtobuf.py
-            ${MSGUTILS_SCRIPTS_DIR}/templates/MsgDefs_proto.jinja
+            ${MSGUTILS_SCRIPTS_DIR}/msgutils/templates/MsgDefs_proto.jinja
             ${${_input_confs}}
         OUTPUT
             ${_protobuf_abs_filename}
@@ -118,11 +118,11 @@
 
     add_custom_command(
         DEPENDS
-            ${MSGUTILS_SCRIPTS_DIR}/MsgData.py
-            ${MSGUTILS_SCRIPTS_DIR}/MsgCpp.py
+            ${MSGUTILS_SCRIPTS_DIR}/msgutils/MsgData.py
+            ${MSGUTILS_SCRIPTS_DIR}/msgutils/MsgCpp.py
             ${MSGUTILS_SCRIPTS_DIR}/GenerateMsgDefsCpp.py
-            ${MSGUTILS_SCRIPTS_DIR}/templates/MsgDefs_h.jinja
-            ${MSGUTILS_SCRIPTS_DIR}/templates/MsgDefs_cpp.jinja
+            ${MSGUTILS_SCRIPTS_DIR}/msgutils/templates/MsgDefs_h.jinja
+            ${MSGUTILS_SCRIPTS_DIR}/msgutils/templates/MsgDefs_cpp.jinja
             ${${_input_csvs}}
         OUTPUT
             ${_header_path}
@@ -162,10 +162,10 @@
 
     add_custom_command(
         DEPENDS
-            ${MSGUTILS_SCRIPTS_DIR}/MsgData.py
-            ${MSGUTILS_SCRIPTS_DIR}/MsgProtobuf.py
+            ${MSGUTILS_SCRIPTS_DIR}/msgutils/MsgData.py
+            ${MSGUTILS_SCRIPTS_DIR}/msgutils/MsgProtobuf.py
             ${MSGUTILS_SCRIPTS_DIR}/GenerateProtobuf.py
-            ${MSGUTILS_SCRIPTS_DIR}/templates/MsgDefs_proto.jinja
+            ${MSGUTILS_SCRIPTS_DIR}/msgutils/templates/MsgDefs_proto.jinja
             ${${_input_csvs}}
         OUTPUT
             ${_protobuf_abs_filename}