diff --git a/Software/WomoLin/CMakeLists.txt b/Software/WomoLin/CMakeLists.txt
new file mode 100644
index 0000000..42fe368
--- /dev/null
+++ b/Software/WomoLin/CMakeLists.txt
@@ -0,0 +1,26 @@
+cmake_minimum_required (VERSION 3.10)
+
+SET(CMAKE_CXX_STANDARD 17)
+SET(CMAKE_C_COMPILER "/usr/bin/gcc-9")
+SET(CMAKE_CXX_COMPILER "/usr/bin/g++-9")
+
+SET(CMAKE_CXX_FLAGS "-DSIMULATION -Wall -Wpedantic -Werror=pedantic -Wextra -Os ")
+
+#enable_testing()
+#include_directories("${CMAKE_CURRENT_SOURCE_DIR}/googletest/googletest/include")
+
+project(womolin)
+
+add_executable(mainunit
+   womolin/enums.cpp
+   womolin/signal.cpp
+   womolin/unit.cpp
+   womolin/protocol.cpp
+   womolin/managerbase.cpp
+   board/mainunit/hal/serial.cpp
+   board/mainunit/hal/serial_simulation_network.cpp
+   board/mainunit/hal/unit.cpp
+   board/mainunit/manager.cpp
+   board/mainunit/main.cpp
+)
+
diff --git a/Software/WomoLin/board/mainunit/build_simulation.sh b/Software/WomoLin/board/mainunit/build_simulation.sh
deleted file mode 100755
index e6b5699..0000000
--- a/Software/WomoLin/board/mainunit/build_simulation.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-rm -f simulation
-g++-9 -DSIMULATION -std=c++17 -Wall -Wpedantic -Werror=pedantic -Wextra -Os -o simulation \
-../../lib/signal.cpp \
-../../lib/protocol.cpp \
-../../lib/managerbase.cpp \
-../../lib/unit.cpp \
-../../lib/enums.cpp \
-./hal/serial.cpp \
-./hal/serial_simulation_network.cpp \
-./hal/unit.cpp \
-manager.cpp \
-main.cpp
diff --git a/Software/WomoLin/board/mainunit/hal/include/serial.h b/Software/WomoLin/board/mainunit/hal/include/serial.h
index 4e6f97d..7c74584 100644
--- a/Software/WomoLin/board/mainunit/hal/include/serial.h
+++ b/Software/WomoLin/board/mainunit/hal/include/serial.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../../../lib/include/ihal.h"
+#include "../../../../womolin/include/ihal.h"
 
 namespace womolin::board::hal
 {
diff --git a/Software/WomoLin/board/mainunit/hal/include/serial_simulation_network.h b/Software/WomoLin/board/mainunit/hal/include/serial_simulation_network.h
index aa6f4f7..7362846 100644
--- a/Software/WomoLin/board/mainunit/hal/include/serial_simulation_network.h
+++ b/Software/WomoLin/board/mainunit/hal/include/serial_simulation_network.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../../../lib/include/ihal.h"
+#include "../../../../womolin/include/ihal.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Software/WomoLin/board/mainunit/hal/include/unit.h b/Software/WomoLin/board/mainunit/hal/include/unit.h
index e821bb5..3f94b27 100644
--- a/Software/WomoLin/board/mainunit/hal/include/unit.h
+++ b/Software/WomoLin/board/mainunit/hal/include/unit.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../../../lib/include/ihal.h"
+#include "../../../../womolin/include/ihal.h"
 #ifdef SIMULATION
 #include <array>
 #endif
diff --git a/Software/WomoLin/board/mainunit/manager.h b/Software/WomoLin/board/mainunit/manager.h
index 9c2bb03..19a4976 100644
--- a/Software/WomoLin/board/mainunit/manager.h
+++ b/Software/WomoLin/board/mainunit/manager.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../lib/include/managerbase.h"
-#include "../../lib/include/unit.h"
+#include "../../womolin/include/managerbase.h"
+#include "../../womolin/include/unit.h"
 #include "./hal/include/unit.h"
 
 namespace womolin::board
diff --git a/Software/WomoLin/build.sh b/Software/WomoLin/build.sh
new file mode 100755
index 0000000..a6cb0ba
--- /dev/null
+++ b/Software/WomoLin/build.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+mkdir -p out
+cd out
+cmake ../
+make all
diff --git a/Software/WomoLin/clean.sh b/Software/WomoLin/clean.sh
new file mode 100755
index 0000000..2c23789
--- /dev/null
+++ b/Software/WomoLin/clean.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+rm -fr  out
diff --git a/Software/WomoLin/lib/enums.cpp b/Software/WomoLin/womolin/enums.cpp
similarity index 100%
rename from Software/WomoLin/lib/enums.cpp
rename to Software/WomoLin/womolin/enums.cpp
diff --git a/Software/WomoLin/lib/include/enums.h b/Software/WomoLin/womolin/include/enums.h
similarity index 100%
rename from Software/WomoLin/lib/include/enums.h
rename to Software/WomoLin/womolin/include/enums.h
diff --git a/Software/WomoLin/lib/include/ihal.h b/Software/WomoLin/womolin/include/ihal.h
similarity index 100%
rename from Software/WomoLin/lib/include/ihal.h
rename to Software/WomoLin/womolin/include/ihal.h
diff --git a/Software/WomoLin/lib/include/isignal.h b/Software/WomoLin/womolin/include/isignal.h
similarity index 100%
rename from Software/WomoLin/lib/include/isignal.h
rename to Software/WomoLin/womolin/include/isignal.h
diff --git a/Software/WomoLin/lib/include/managerbase.h b/Software/WomoLin/womolin/include/managerbase.h
similarity index 100%
rename from Software/WomoLin/lib/include/managerbase.h
rename to Software/WomoLin/womolin/include/managerbase.h
diff --git a/Software/WomoLin/lib/include/protocol.h b/Software/WomoLin/womolin/include/protocol.h
similarity index 100%
rename from Software/WomoLin/lib/include/protocol.h
rename to Software/WomoLin/womolin/include/protocol.h
diff --git a/Software/WomoLin/lib/include/signal.h b/Software/WomoLin/womolin/include/signal.h
similarity index 100%
rename from Software/WomoLin/lib/include/signal.h
rename to Software/WomoLin/womolin/include/signal.h
diff --git a/Software/WomoLin/lib/include/unit.h b/Software/WomoLin/womolin/include/unit.h
similarity index 100%
rename from Software/WomoLin/lib/include/unit.h
rename to Software/WomoLin/womolin/include/unit.h
diff --git a/Software/WomoLin/lib/managerbase.cpp b/Software/WomoLin/womolin/managerbase.cpp
similarity index 100%
rename from Software/WomoLin/lib/managerbase.cpp
rename to Software/WomoLin/womolin/managerbase.cpp
diff --git a/Software/WomoLin/lib/protocol.cpp b/Software/WomoLin/womolin/protocol.cpp
similarity index 100%
rename from Software/WomoLin/lib/protocol.cpp
rename to Software/WomoLin/womolin/protocol.cpp
diff --git a/Software/WomoLin/lib/signal.cpp b/Software/WomoLin/womolin/signal.cpp
similarity index 100%
rename from Software/WomoLin/lib/signal.cpp
rename to Software/WomoLin/womolin/signal.cpp
diff --git a/Software/WomoLin/lib/unit.cpp b/Software/WomoLin/womolin/unit.cpp
similarity index 100%
rename from Software/WomoLin/lib/unit.cpp
rename to Software/WomoLin/womolin/unit.cpp