diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1d63b5a3adfc8f75f7c4606ef769aa472fcfabf3..05c30ae99831d3ff4b0d093b273755e6167616e0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -89,9 +89,8 @@ add_subdirectory(libMeter)
 add_subdirectory(libLoad)
 add_subdirectory(libCom)
 add_subdirectory(libDevCom)
-add_subdirectory(libGalil)
 add_subdirectory(libImageRec)
-add_subdirectory(libZaber)
+add_subdirectory(libMotion)
 add_subdirectory(libWaferProb)
 add_subdirectory(libScope)
 add_subdirectory(libWaveFormGen)
diff --git a/src/libGalil/CMakeLists.txt b/src/libGalil/CMakeLists.txt
deleted file mode 100644
index 7289c32a25c19acea64a39c14b87d0f0865dd593..0000000000000000000000000000000000000000
--- a/src/libGalil/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-find_package( libgclib QUIET)
-find_package( ZLIB )
-
-if ( NOT "${LIBGCLIB_FOUND}" )
-  message(STATUS "Disabling libGalil due to missing dependencies (LIBGCLIB_FOUND = ${LIBGCLIB_FOUND})")
-
-  set(libGalil_FOUND FALSE PARENT_SCOPE)
-  return()
-endif()
-
-#
-# Prepare the library
-add_library(Galil SHARED)
-target_sources(Galil
-  PRIVATE
-  arrays.cpp
-  gclibo.cpp
-  )
-target_link_libraries(Galil ${LIBGCLIB_LIBRARIES} ${zlib_libraries} )
-
-# Tell rest of labRemote that the library exists
-set(libGalil_FOUND TRUE PARENT_SCOPE)
diff --git a/src/libMotion/CMakeLists.txt b/src/libMotion/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2af6e250beac40e080ba87b2427c5f7b6b02a167
--- /dev/null
+++ b/src/libMotion/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_library(Motion SHARED)
+target_sources(Motion
+  PRIVATE
+  za_serial.cpp
+  arrays.cpp
+  gclibo.cpp
+  ControllerBase.cpp
+  ControllerGalil.cpp
+  ControllerZaber.cpp
+  Helper.cpp
+)
+target_include_directories(Motion PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/libWaferProb/ControllerBase.cpp b/src/libMotion/ControllerBase.cpp
similarity index 100%
rename from src/libWaferProb/ControllerBase.cpp
rename to src/libMotion/ControllerBase.cpp
diff --git a/src/libWaferProb/ControllerBase.h b/src/libMotion/ControllerBase.h
similarity index 100%
rename from src/libWaferProb/ControllerBase.h
rename to src/libMotion/ControllerBase.h
diff --git a/src/libWaferProb/ControllerGalil.cpp b/src/libMotion/ControllerGalil.cpp
similarity index 100%
rename from src/libWaferProb/ControllerGalil.cpp
rename to src/libMotion/ControllerGalil.cpp
diff --git a/src/libWaferProb/ControllerGalil.h b/src/libMotion/ControllerGalil.h
similarity index 100%
rename from src/libWaferProb/ControllerGalil.h
rename to src/libMotion/ControllerGalil.h
diff --git a/src/libWaferProb/ControllerZaber.cpp b/src/libMotion/ControllerZaber.cpp
similarity index 100%
rename from src/libWaferProb/ControllerZaber.cpp
rename to src/libMotion/ControllerZaber.cpp
diff --git a/src/libWaferProb/ControllerZaber.h b/src/libMotion/ControllerZaber.h
similarity index 100%
rename from src/libWaferProb/ControllerZaber.h
rename to src/libMotion/ControllerZaber.h
diff --git a/src/libWaferProb/Helper.cpp b/src/libMotion/Helper.cpp
similarity index 100%
rename from src/libWaferProb/Helper.cpp
rename to src/libMotion/Helper.cpp
diff --git a/src/libWaferProb/Helper.h b/src/libMotion/Helper.h
similarity index 100%
rename from src/libWaferProb/Helper.h
rename to src/libMotion/Helper.h
diff --git a/src/libGalil/arrays.cpp b/src/libMotion/arrays.cpp
similarity index 100%
rename from src/libGalil/arrays.cpp
rename to src/libMotion/arrays.cpp
diff --git a/src/libGalil/gclib.h b/src/libMotion/gclib.h
similarity index 100%
rename from src/libGalil/gclib.h
rename to src/libMotion/gclib.h
diff --git a/src/libGalil/gclib_errors.h b/src/libMotion/gclib_errors.h
similarity index 100%
rename from src/libGalil/gclib_errors.h
rename to src/libMotion/gclib_errors.h
diff --git a/src/libGalil/gclib_record.h b/src/libMotion/gclib_record.h
similarity index 100%
rename from src/libGalil/gclib_record.h
rename to src/libMotion/gclib_record.h
diff --git a/src/libGalil/gclibo.cpp b/src/libMotion/gclibo.cpp
similarity index 100%
rename from src/libGalil/gclibo.cpp
rename to src/libMotion/gclibo.cpp
diff --git a/src/libGalil/gclibo.h b/src/libMotion/gclibo.h
similarity index 100%
rename from src/libGalil/gclibo.h
rename to src/libMotion/gclibo.h
diff --git a/src/libZaber/z_common.h b/src/libMotion/z_common.h
similarity index 100%
rename from src/libZaber/z_common.h
rename to src/libMotion/z_common.h
diff --git a/src/libZaber/za_serial.cpp b/src/libMotion/za_serial.cpp
similarity index 100%
rename from src/libZaber/za_serial.cpp
rename to src/libMotion/za_serial.cpp
diff --git a/src/libZaber/za_serial.h b/src/libMotion/za_serial.h
similarity index 100%
rename from src/libZaber/za_serial.h
rename to src/libMotion/za_serial.h
diff --git a/src/libWaferProb/CMakeLists.txt b/src/libWaferProb/CMakeLists.txt
index 1181d6170dd83d0b92402bd40cd231cfc3eb474b..07c74e397c7d8e7987e03324ae12f8b026c0317e 100644
--- a/src/libWaferProb/CMakeLists.txt
+++ b/src/libWaferProb/CMakeLists.txt
@@ -10,11 +10,7 @@ endif()
 add_library(WaferProb SHARED)
 target_sources(WaferProb
   PRIVATE
-  ControllerBase.cpp
-  ControllerGalil.cpp
-  ControllerZaber.cpp
   Handler.cpp    
-  Helper.cpp
   MotionController.cpp
   )
 
diff --git a/src/libZaber/CMakeLists.txt b/src/libZaber/CMakeLists.txt
deleted file mode 100644
index 794fd41d55f778ff30463407215212e4a97576b2..0000000000000000000000000000000000000000
--- a/src/libZaber/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-add_library(Zaber SHARED)
-target_sources(Zaber
-  PRIVATE
-  za_serial.cpp
-)
-target_include_directories(Zaber PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})