diff --git a/buildAll.sh b/buildAll.sh
deleted file mode 100755
index 6bddcecda31e8eacc26344776a39b1b49ee79c7b..0000000000000000000000000000000000000000
--- a/buildAll.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-# build como_samples
-
-if [ ! -n "${ROOT}" ]; then
-    echo "Not in COMO build environment!";
-    exit 0;
-fi
-
-cd external/phxpaxos
-./MakeMe.sh
-cd ../..
-
-cd out
-cmake ..
-make
-
-cd ../ComoFramework_bin
-
-# Tools
-mkdir -p Tools
-cd Tools
-# MeasurementAccuracy
-mkdir -p MeasurementAccuracy
-cd MeasurementAccuracy
-gcc -O2 -o clock_gettime_MeasurementAccuracy ../../../Tools/MeasurementAccuracy/clock_gettime_MeasurementAccuracy.c
-gcc -O2 -o ntp_offset_monitor ../../../Tools/MeasurementAccuracy/ntp_offset_monitor.c
-gcc -O2 -o ntp_once_MeasurementAccuracy ../../../Tools/MeasurementAccuracy/ntp_once_MeasurementAccuracy.c
-gcc -O2 -o udp_time_server_ns ../../../Tools/MeasurementAccuracy/udp_time_server_ns.c
-gcc -O2 -o udp_time_client_ns ../../../Tools/MeasurementAccuracy/udp_time_client_ns.c
-# UDPMessage
-cd ..
-mkdir -p UDPMessage
-cd UDPMessage
-gcc -O2 -o transaction_sync_MeasurementAccuracy ../../../Tools/UDPMessage/transaction_sync_MeasurementAccuracy.c
-cp ../../../Tools/UDPMessage/transaction_sync_MeasurementAccuracy.py .
-gcc -O2 -o udp_sender_in_cycles ../../../Tools/UDPMessage/udp_sender_in_cycles.c
-g++ -O2 -o UDPMessageGenerator ../../../Tools/UDPMessage/UDPMessageGenerator.cpp
-g++ -O2 -o UDPMessageReceiver ../../../Tools/UDPMessage/UDPMessageReceiver.cpp
-
-# APPs
-cd ../..
-mkdir -p APPs
-cd APPs
-cp ../../out/APPs/SampleFixedPeriod/SampleFixedPeriod .
-cp ../../out/APPs/SampleFixedPeriodCommander/SampleFixedPeriodCommander .
-cp ../../out/APPs/SampleUDPFixedPeriodCommander/SampleUDPFixedPeriodCommander .
-cp ../../out/APPs/SpeedTestFixedPeriod/SpeedTestFixedPeriod .
-cp ../../out/APPs/SpeedTestFixedPeriodCommander/SpeedTestFixedPeriodCommander .
-
-cp ../../../como/bin/target/como.linux.x64.rls/comort.so .
-
-cd ../..
diff --git a/buildMe.sh b/buildMe.sh
index d04c5da3409206fba9e0fa78ff0b97085222af39..01424189d18faa7f7493ab8d27c9e4874848d8ef 100755
--- a/buildMe.sh
+++ b/buildMe.sh
@@ -24,6 +24,7 @@ cd Tools
 mkdir -p MeasurementAccuracy
 cd MeasurementAccuracy
 gcc -O2 -o clock_gettime_MeasurementAccuracy ../../../XuWareTools/MeasurementAccuracy/clock_gettime_MeasurementAccuracy.c
+gcc -O2 -Wall -o nanosleep_realtime ../../../XuWareTools/MeasurementAccuracy/nanosleep_realtime.c
 gcc -O2 -o ntp_offset_monitor ../../../XuWareTools/MeasurementAccuracy/ntp_offset_monitor.c
 gcc -O2 -o ntp_once_MeasurementAccuracy ../../../XuWareTools/MeasurementAccuracy/ntp_once_MeasurementAccuracy.c
 gcc -O2 -o udp_time_server_ns ../../../XuWareTools/MeasurementAccuracy/udp_time_server_ns.c
diff --git a/buildTools.sh b/buildTools.sh
index bfc1ebc4e77e39695ac7d6e89abcf2f69cebe33b..583aa45ecbd06e799e2c9d32f1c8a3352b5234bf 100755
--- a/buildTools.sh
+++ b/buildTools.sh
@@ -8,17 +8,18 @@ cd Tools
 # MeasurementAccuracy
 mkdir -p MeasurementAccuracy
 cd MeasurementAccuracy
-gcc -O2 -o clock_gettime_MeasurementAccuracy ../../../Tools/MeasurementAccuracy/clock_gettime_MeasurementAccuracy.c
-gcc -O2 -o ntp_offset_monitor ../../../Tools/MeasurementAccuracy/ntp_offset_monitor.c
-gcc -O2 -o ntp_once_MeasurementAccuracy ../../../Tools/MeasurementAccuracy/ntp_once_MeasurementAccuracy.c
-gcc -O2 -o udp_time_server_ns ../../../Tools/MeasurementAccuracy/udp_time_server_ns.c
-gcc -O2 -o udp_time_client_ns ../../../Tools/MeasurementAccuracy/udp_time_client_ns.c
+gcc -O2 -o clock_gettime_MeasurementAccuracy ../../../XuWareTools/MeasurementAccuracy/clock_gettime_MeasurementAccuracy.c
+gcc -O2 -Wall -o nanosleep_realtime ../../../XuWareTools/MeasurementAccuracy/nanosleep_realtime.c
+gcc -O2 -o ntp_offset_monitor ../../../XuWareTools/MeasurementAccuracy/ntp_offset_monitor.c
+gcc -O2 -o ntp_once_MeasurementAccuracy ../../../XuWareTools/MeasurementAccuracy/ntp_once_MeasurementAccuracy.c
+gcc -O2 -o udp_time_server_ns ../../../XuWareTools/MeasurementAccuracy/udp_time_server_ns.c
+gcc -O2 -o udp_time_client_ns ../../../XuWareTools/MeasurementAccuracy/udp_time_client_ns.c
 # UDPMessage
 cd ..
 mkdir -p UDPMessage
 cd UDPMessage
-gcc -O2 -o transaction_sync_MeasurementAccuracy ../../../Tools/UDPMessage/transaction_sync_MeasurementAccuracy.c
-cp ../../../Tools/UDPMessage/transaction_sync_MeasurementAccuracy.py .
-gcc -O2 -o udp_sender_in_cycles ../../../Tools/UDPMessage/udp_sender_in_cycles.c
-g++ -O2 -o UDPMessageGenerator ../../../Tools/UDPMessage/UDPMessageGenerator.cpp
-g++ -O2 -o UDPMessageReceiver ../../../Tools/UDPMessage/UDPMessageReceiver.cpp
+gcc -O2 -o transaction_sync_MeasurementAccuracy ../../../XuWareTools/UDPMessage/transaction_sync_MeasurementAccuracy.c
+cp ../../../XuWareTools/UDPMessage/transaction_sync_MeasurementAccuracy.py .
+gcc -O2 -o udp_sender_in_cycles ../../../XuWareTools/UDPMessage/udp_sender_in_cycles.c
+g++ -O2 -o UDPMessageGenerator ../../../XuWareTools/UDPMessage/UDPMessageGenerator.cpp
+g++ -O2 -o UDPMessageReceiver ../../../XuWareTools/UDPMessage/UDPMessageReceiver.cpp