diff --git a/01_ENV/build-c.sh b/01_ENV/MP/build-c.sh
old mode 100755
new mode 100644
similarity index 100%
rename from 01_ENV/build-c.sh
rename to 01_ENV/MP/build-c.sh
diff --git a/01_ENV/build.sh b/01_ENV/MP/build.sh
old mode 100755
new mode 100644
similarity index 100%
rename from 01_ENV/build.sh
rename to 01_ENV/MP/build.sh
diff --git a/01_ENV/clean.sh b/01_ENV/MP/clean.sh
old mode 100755
new mode 100644
similarity index 100%
rename from 01_ENV/clean.sh
rename to 01_ENV/MP/clean.sh
diff --git a/01_ENV/func1.c b/01_ENV/MP/func1.c
similarity index 100%
rename from 01_ENV/func1.c
rename to 01_ENV/MP/func1.c
diff --git a/01_ENV/func1.h b/01_ENV/MP/func1.h
similarity index 100%
rename from 01_ENV/func1.h
rename to 01_ENV/MP/func1.h
diff --git a/01_ENV/main.c b/01_ENV/MP/main.c
similarity index 100%
rename from 01_ENV/main.c
rename to 01_ENV/MP/main.c
diff --git a/01_ENV/main_plain.c b/01_ENV/MP/main_plain.c
similarity index 100%
rename from 01_ENV/main_plain.c
rename to 01_ENV/MP/main_plain.c
diff --git a/02_MENT/build.sh b/02_MENT/MP/build.sh
old mode 100755
new mode 100644
similarity index 100%
rename from 02_MENT/build.sh
rename to 02_MENT/MP/build.sh
diff --git a/02_MENT/limits.cpp b/02_MENT/MP/limits.cpp
similarity index 100%
rename from 02_MENT/limits.cpp
rename to 02_MENT/MP/limits.cpp
diff --git a/02_MENT/limits_println.cpp b/02_MENT/MP/limits_println.cpp
similarity index 100%
rename from 02_MENT/limits_println.cpp
rename to 02_MENT/MP/limits_println.cpp
diff --git a/02_MENT/main_02_MENT.cpp b/02_MENT/MP/main_02_MENT.cpp
similarity index 99%
rename from 02_MENT/main_02_MENT.cpp
rename to 02_MENT/MP/main_02_MENT.cpp
index 6ec3665..4dbe719 100644
--- a/02_MENT/main_02_MENT.cpp
+++ b/02_MENT/MP/main_02_MENT.cpp
@@ -3,7 +3,7 @@
 
 #include <iostream>
 
-#include "../helpers/println.hpp"
+#include "../../helpers/println.hpp"
 
 struct PascalString{
 	int length;            // number of chars used
diff --git a/02_MENT/printlnDemo.cpp b/02_MENT/MP/printlnDemo.cpp
similarity index 100%
rename from 02_MENT/printlnDemo.cpp
rename to 02_MENT/MP/printlnDemo.cpp
diff --git a/02_MENT/typedMemory/typedMemory/main.cpp b/02_MENT/MP/typedMemory/typedMemory/main.cpp
similarity index 100%
rename from 02_MENT/typedMemory/typedMemory/main.cpp
rename to 02_MENT/MP/typedMemory/typedMemory/main.cpp
diff --git a/02_MENT/typedMemory/typedMemory/typedMemory.cpp b/02_MENT/MP/typedMemory/typedMemory/typedMemory.cpp
similarity index 100%
rename from 02_MENT/typedMemory/typedMemory/typedMemory.cpp
rename to 02_MENT/MP/typedMemory/typedMemory/typedMemory.cpp
diff --git a/02_MENT/typedMemory/typedMemory/typedMemory.hpp b/02_MENT/MP/typedMemory/typedMemory/typedMemory.hpp
similarity index 100%
rename from 02_MENT/typedMemory/typedMemory/typedMemory.hpp
rename to 02_MENT/MP/typedMemory/typedMemory/typedMemory.hpp
diff --git a/03_FLOW_a/build.sh b/03_FLOW_a/MP/build.sh
old mode 100755
new mode 100644
similarity index 91%
rename from 03_FLOW_a/build.sh
rename to 03_FLOW_a/MP/build.sh
index f01dc81..0b9f65b
--- a/03_FLOW_a/build.sh
+++ b/03_FLOW_a/MP/build.sh
@@ -2,4 +2,4 @@
 rm *.out
 clang++-6.0 -std=c++14 -I ../helpers -o flow.out  main_mp2_FLOW_a.cpp ../helpers/AnsiConsole.cpp
 
-./flow.out
+./flow.out
\ No newline at end of file
diff --git a/03_FLOW_a/main_mp2_FLOW_a.cpp b/03_FLOW_a/MP/main_mp2_FLOW_a.cpp
similarity index 100%
rename from 03_FLOW_a/main_mp2_FLOW_a.cpp
rename to 03_FLOW_a/MP/main_mp2_FLOW_a.cpp
diff --git a/04_UDEF/RationalNumber.cpp b/04_UDEF/MP/RationalNumber.cpp
similarity index 100%
rename from 04_UDEF/RationalNumber.cpp
rename to 04_UDEF/MP/RationalNumber.cpp
diff --git a/04_UDEF/RationalNumber.hpp b/04_UDEF/MP/RationalNumber.hpp
similarity index 100%
rename from 04_UDEF/RationalNumber.hpp
rename to 04_UDEF/MP/RationalNumber.hpp
diff --git a/04_UDEF/main_04_UDEF_a.cpp b/04_UDEF/MP/main_04_UDEF_a.cpp
similarity index 95%
rename from 04_UDEF/main_04_UDEF_a.cpp
rename to 04_UDEF/MP/main_04_UDEF_a.cpp
index ef2894e..f084c93 100644
--- a/04_UDEF/main_04_UDEF_a.cpp
+++ b/04_UDEF/MP/main_04_UDEF_a.cpp
@@ -1,5 +1,5 @@
 // file: main_04_UDEF_a.cpp
-#include "../helpers/println.hpp"
+#include "../../helpers/println.hpp"
 #include "RationalNumber.hpp"
 
 // location 1
diff --git a/04_UDEF/main_04_UDEF_e.cpp b/04_UDEF/MP/main_04_UDEF_e.cpp
similarity index 97%
rename from 04_UDEF/main_04_UDEF_e.cpp
rename to 04_UDEF/MP/main_04_UDEF_e.cpp
index 0f7850e..f1b92c9 100644
--- a/04_UDEF/main_04_UDEF_e.cpp
+++ b/04_UDEF/MP/main_04_UDEF_e.cpp
@@ -1,5 +1,5 @@
 // file main_04_UDEF_e.cpp
-#include "../helpers/println.hpp"
+#include "../../helpers/println.hpp"
 #include <iostream>
 
 const int bitsPerOctet = 8;
diff --git a/05_OO/AnsiConsoleDemo.cpp b/05_OO/MP/AnsiConsoleDemo.cpp
similarity index 100%
rename from 05_OO/AnsiConsoleDemo.cpp
rename to 05_OO/MP/AnsiConsoleDemo.cpp
diff --git a/05_OO/build.sh b/05_OO/MP/build.sh
similarity index 100%
rename from 05_OO/build.sh
rename to 05_OO/MP/build.sh
diff --git a/05_OO/main_mp4_OO_a_vehicles.cpp b/05_OO/MP/main_mp4_OO_a_vehicles.cpp
similarity index 100%
rename from 05_OO/main_mp4_OO_a_vehicles.cpp
rename to 05_OO/MP/main_mp4_OO_a_vehicles.cpp
diff --git a/05_OO/main_mp4_OO_b.cpp b/05_OO/MP/main_mp4_OO_b.cpp
similarity index 100%
rename from 05_OO/main_mp4_OO_b.cpp
rename to 05_OO/MP/main_mp4_OO_b.cpp
diff --git a/05_OO/shapes_main.cpp b/05_OO/MP/shapes_main.cpp
similarity index 98%
rename from 05_OO/shapes_main.cpp
rename to 05_OO/MP/shapes_main.cpp
index 7b012c5..a2e7433 100644
--- a/05_OO/shapes_main.cpp
+++ b/05_OO/MP/shapes_main.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <cmath>
-#include "../helpers/AnsiConsole.h"
+#include "../../helpers/AnsiConsole.h"
 
 struct Position {
     int x;
diff --git a/06_POLY/main_mp5_POLY.cpp b/06_POLY/MP/main_mp5_POLY.cpp
similarity index 100%
rename from 06_POLY/main_mp5_POLY.cpp
rename to 06_POLY/MP/main_mp5_POLY.cpp
diff --git a/07_STD/6_STD_stacks/genericStack.hpp b/07_STD/MP/6_STD_stacks/genericStack.hpp
similarity index 100%
rename from 07_STD/6_STD_stacks/genericStack.hpp
rename to 07_STD/MP/6_STD_stacks/genericStack.hpp
diff --git a/07_STD/6_STD_stacks/intStack.cpp b/07_STD/MP/6_STD_stacks/intStack.cpp
similarity index 100%
rename from 07_STD/6_STD_stacks/intStack.cpp
rename to 07_STD/MP/6_STD_stacks/intStack.cpp
diff --git a/07_STD/6_STD_stacks/intStack.hpp b/07_STD/MP/6_STD_stacks/intStack.hpp
similarity index 100%
rename from 07_STD/6_STD_stacks/intStack.hpp
rename to 07_STD/MP/6_STD_stacks/intStack.hpp
diff --git a/07_STD/6_STD_stacks/main.cpp b/07_STD/MP/6_STD_stacks/main.cpp
similarity index 100%
rename from 07_STD/6_STD_stacks/main.cpp
rename to 07_STD/MP/6_STD_stacks/main.cpp
diff --git a/07_STD/grundgeruest.cpp b/07_STD/MP/grundgeruest.cpp
similarity index 100%
rename from 07_STD/grundgeruest.cpp
rename to 07_STD/MP/grundgeruest.cpp
diff --git a/08_PTRN/Car.cpp b/08_PTRN/MP/Car.cpp
similarity index 100%
rename from 08_PTRN/Car.cpp
rename to 08_PTRN/MP/Car.cpp
diff --git a/08_PTRN/Car.hpp b/08_PTRN/MP/Car.hpp
similarity index 100%
rename from 08_PTRN/Car.hpp
rename to 08_PTRN/MP/Car.hpp
diff --git a/08_PTRN/Logger.cpp b/08_PTRN/MP/Logger.cpp
similarity index 100%
rename from 08_PTRN/Logger.cpp
rename to 08_PTRN/MP/Logger.cpp
diff --git a/08_PTRN/Logger.hpp b/08_PTRN/MP/Logger.hpp
similarity index 100%
rename from 08_PTRN/Logger.hpp
rename to 08_PTRN/MP/Logger.hpp
diff --git a/08_PTRN/Truck.cpp b/08_PTRN/MP/Truck.cpp
similarity index 100%
rename from 08_PTRN/Truck.cpp
rename to 08_PTRN/MP/Truck.cpp
diff --git a/08_PTRN/Truck.hpp b/08_PTRN/MP/Truck.hpp
similarity index 100%
rename from 08_PTRN/Truck.hpp
rename to 08_PTRN/MP/Truck.hpp
diff --git a/08_PTRN/Vehicle.cpp b/08_PTRN/MP/Vehicle.cpp
similarity index 100%
rename from 08_PTRN/Vehicle.cpp
rename to 08_PTRN/MP/Vehicle.cpp
diff --git a/08_PTRN/Vehicle.hpp b/08_PTRN/MP/Vehicle.hpp
similarity index 100%
rename from 08_PTRN/Vehicle.hpp
rename to 08_PTRN/MP/Vehicle.hpp
diff --git a/08_PTRN/VehicleFactory.cpp b/08_PTRN/MP/VehicleFactory.cpp
similarity index 100%
rename from 08_PTRN/VehicleFactory.cpp
rename to 08_PTRN/MP/VehicleFactory.cpp
diff --git a/08_PTRN/VehicleFactory.hpp b/08_PTRN/MP/VehicleFactory.hpp
similarity index 100%
rename from 08_PTRN/VehicleFactory.hpp
rename to 08_PTRN/MP/VehicleFactory.hpp
diff --git a/08_PTRN/main.cpp b/08_PTRN/MP/main.cpp
similarity index 100%
rename from 08_PTRN/main.cpp
rename to 08_PTRN/MP/main.cpp
diff --git a/10_PITF/banking_base_rawptr.cpp b/10_PITF/MP/banking_base_rawptr.cpp
similarity index 98%
rename from 10_PITF/banking_base_rawptr.cpp
rename to 10_PITF/MP/banking_base_rawptr.cpp
index 1497bb6..b6d39b5 100644
--- a/10_PITF/banking_base_rawptr.cpp
+++ b/10_PITF/MP/banking_base_rawptr.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <cassert>
 #include <vector>
-#include "../helpers/println.hpp"
+#include "../../helpers/println.hpp"
 
 
 struct StackObject {
diff --git a/10_PITF/build.sh b/10_PITF/MP/build.sh
similarity index 100%
rename from 10_PITF/build.sh
rename to 10_PITF/MP/build.sh
diff --git a/10_PITF/doubleDelete/LifeCycleProbe.cpp b/10_PITF/MP/doubleDelete/LifeCycleProbe.cpp
similarity index 100%
rename from 10_PITF/doubleDelete/LifeCycleProbe.cpp
rename to 10_PITF/MP/doubleDelete/LifeCycleProbe.cpp
diff --git a/10_PITF/doubleDelete/LifeCycleProbe.hpp b/10_PITF/MP/doubleDelete/LifeCycleProbe.hpp
similarity index 100%
rename from 10_PITF/doubleDelete/LifeCycleProbe.hpp
rename to 10_PITF/MP/doubleDelete/LifeCycleProbe.hpp
diff --git a/10_PITF/doubleDelete/main.cpp b/10_PITF/MP/doubleDelete/main.cpp
similarity index 100%
rename from 10_PITF/doubleDelete/main.cpp
rename to 10_PITF/MP/doubleDelete/main.cpp
diff --git a/10_PITF/main_objectSlicing.cpp b/10_PITF/MP/main_objectSlicing.cpp
similarity index 100%
rename from 10_PITF/main_objectSlicing.cpp
rename to 10_PITF/MP/main_objectSlicing.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e74b036..7d49df5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,28 +1,36 @@
 cmake_minimum_required(VERSION 3.3)
-project(test_build)
+project(C/C++)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 
-add_executable(MentalModel 02_MENT/main_02_MENT.cpp)
+add_executable(01_ENV_MP 01_ENV/MP/main.c 01_ENV/MP/func1.c)
+add_executable(01_ENV_Testat 01_ENV/Testat/main.c 01_ENV/Testat/func1.c)
 
-add_executable(UDEF_1 04_UDEF/main_04_UDEF_e.cpp)
-#add_executable(UDEF_2 04_UDEF/main_04_UDEF_a.cpp)
+add_executable(02_MENT_MP 02_MENT/MP/main_02_MENT.cpp)
+add_executable(02_MENT_Testat_1 02_MENT/Testat/main_02_MENT.cpp)
+add_executable(02_MENT_Testat_2 02_MENT/Testat2/main_02_MENT.cpp)
+
+add_executable(03_FLOW_MP 03_FLOW_a/MP/main_mp2_FLOW_a.cpp)
+add_executable(03_FLOW_Testat 03_FLOW_a/Testat/main_mp2_FLOW_a.cpp)
+
+add_executable(UDEF_MP_1 04_UDEF/MP/main_04_UDEF_e.cpp)
+add_executable(UDEF_MP_2 04_UDEF/MP/main_04_UDEF_a.cpp)
 add_executable(UDEF_Testat 04_UDEF/Testat/Testat.cpp)
 
-
-add_executable(OO_A 05_OO/main_mp4_OO_a_vehicles.cpp)
+add_executable(OO_5_MP 05_OO/MP/main_mp4_OO_a_vehicles.cpp)
+#add_executable(OO_5_Testat 05_OO/Testat/)
 #add_executable(OO_B 05_OO/main_mp4_OO_b.cpp)
 
 #add_executable(OO_Shapes 05_OO/shapes_main.cpp)
 
-add_executable(Poly 06_POLY/main_mp5_POLY.cpp)
+add_executable(06_POLY 06_POLY/MP/main_mp5_POLY.cpp)
 
-add_executable(SequenceDiagram 11_PUTT/05_OO_b/SequenceDiagramCreator.cpp 11_PUTT/05_OO_b/main.cpp)
+#add_executable(SequenceDiagram 11_PUTT/05_OO_b/SequenceDiagramCreator.cpp 11_PUTT/05_OO_b/main.cpp)
 
-add_executable(LCDDisplay 11_PUTT/02_Ment/LCDDisplay.cpp)
+#add_executable(LCDDisplay 11_PUTT/02_Ment/LCDDisplay.cpp)
 
-add_executable(CopyOnWrite 11_PUTT/CopyOnWrite/OneByOneMatrix.cpp 11_PUTT/CopyOnWrite/LargeCowMatrix.cpp 11_PUTT/CopyOnWrite/main.cpp)
+#add_executable(CopyOnWrite 11_PUTT/CopyOnWrite/OneByOneMatrix.cpp 11_PUTT/CopyOnWrite/LargeCowMatrix.cpp 11_PUTT/CopyOnWrite/main.cpp)
 
-add_executable(Banking 10_PITF/banking_base_rawptr.cpp)
+#add_executable(Banking 10_PITF/MP/banking_base_rawptr.cpp)
 
-add_executable(Test 11_PUTT/Test.cpp)
\ No newline at end of file
+#add_executable(Test 11_PUTT/Test.cpp)
\ No newline at end of file