diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..352e732
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "dosutils"]
+	path = dosutils
+	url = git@disconnected-by-peer.at:mars_nwe/mars-dosutils.git
+[submodule "mail"]
+	path = mail
+	url = git@disconnected-by-peer.at:mars_nwe/mars-mail.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f17758..378b123 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,6 +121,9 @@ add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 add_subdirectory(include)
 add_subdirectory(src)
 add_subdirectory(opt)
+add_subdirectory(sys)
+add_subdirectory(dosutils)
+add_subdirectory(mail)
 
 #SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Common Authentication Service Adapter (CASA).")
 #SET(CPACK_PACKAGE_VENDOR "http://code.google.com/p/casa-auth/")
diff --git a/dosutils b/dosutils
new file mode 160000
index 0000000..5e75a9e
--- /dev/null
+++ b/dosutils
@@ -0,0 +1 @@
+Subproject commit 5e75a9e8a706830341caf6d2f0516cc945dbf25a
diff --git a/mail b/mail
new file mode 160000
index 0000000..e49fb58
--- /dev/null
+++ b/mail
@@ -0,0 +1 @@
+Subproject commit e49fb581e465467d3e66fa9d6e87767e5f9ac009
diff --git a/opt/CMakeLists.txt b/opt/CMakeLists.txt
index 1a428cf..c6f7b98 100644
--- a/opt/CMakeLists.txt
+++ b/opt/CMakeLists.txt
@@ -37,14 +37,6 @@ add_definitions(
 # Source Files
 ##############
 
-
-#SET (include_src
-#    cbmcopy.h
-#    d64copy.h
-#    opencbm.h
-#    )
-
-
 add_executable( comm comm.c )
 add_executable( sendm sendm.c )
 add_executable( unxcomm unxcomm.c )
@@ -59,7 +51,6 @@ add_executable( unxsendm unxsendm.c )
 # Install Files
 ##############
 
-#install(FILES ${include_src} DESTINATION ${INCLUDE_INSTALL_DIR})
 install(FILES nwserv.conf DESTINATION ${MARS_NWE_INSTALL_FULL_CONFDIR})
 install(FILES nwserv.stations DESTINATION ${MARS_NWE_INSTALL_FULL_CONFDIR})
 install(FILES nw.ini.cnv.437 DESTINATION ${MARS_NWE_INSTALL_FULL_CONFDIR}/nwserv.cnv.437)
diff --git a/sys/CMakeLists.txt b/sys/CMakeLists.txt
new file mode 100644
index 0000000..a70aec5
--- /dev/null
+++ b/sys/CMakeLists.txt
@@ -0,0 +1,51 @@
+#################################
+# Project
+##############
+
+#################################
+# Dependencies
+##############
+
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/net$log.dat.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/net$log.dat"
+    IMMEDIATE @ONLY)
+
+#################################
+# Compiler Switches
+##############
+
+INCLUDE_DIRECTORIES(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/include
+    ${CMAKE_BINARY_DIR}/include
+)
+
+if (CMAKE_SYSTEM_NAME MATCHES Linux)
+    add_definitions(
+        -DLINUX -D_GNU_SOURCE -Dsignal=__sysv_signal
+    )
+endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+
+add_definitions(
+        -D_VERS_H_=\"${VERSION_MAJOR}\"
+        -D_VERS_L_=\"${VERSION_MINOR}\"
+        -D_VERS_P_=\"${VERSION_PATCH}\"
+    )
+
+#################################
+# Source Files
+##############
+
+#add_executable( comm comm.c )
+
+#################################
+# Linking
+##############
+
+#################################
+# Install Files
+##############
+
+install(FILES net$log.dat comm.exe comm32.exe DESTINATION ${MARS_NWE_INSTALL_FULL_FILEDIR}/SYS/)
+