diff --git a/env/$ b/$
similarity index 100%
rename from env/$
rename to $
diff --git a/env/CMakeLists.txt b/CMakeLists.txt
similarity index 99%
rename from env/CMakeLists.txt
rename to CMakeLists.txt
index 2e672c8..6f9e069 100644
--- a/env/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,7 @@ message("${Blue} |--> Libs used\t\t: ${EXTRA_LIBS} ${ColourReset}")
 ####################################################################################################
 #EXECUTABLE
 ####################################################################################################
-add_executable(${EXECUTABLE} ../../main.c)
+add_executable(${EXECUTABLE} ../main.c)
 target_compile_options(${EXECUTABLE} PRIVATE ${MAIN_FLAGS})
 target_compile_definitions(${EXECUTABLE} PRIVATE ${MAIN_DEFS})
 target_include_directories(${EXECUTABLE} PUBLIC ${MAIN_INCLUDES})
diff --git a/env/config/cmakeProjectConfig.cmake b/config/cmakeProjectConfig.cmake
similarity index 100%
rename from env/config/cmakeProjectConfig.cmake
rename to config/cmakeProjectConfig.cmake
diff --git a/env/config/compiler.cmake b/config/compiler.cmake
similarity index 100%
rename from env/config/compiler.cmake
rename to config/compiler.cmake
diff --git a/env/config/doxyfile.in b/config/doxyfile.in
similarity index 100%
rename from env/config/doxyfile.in
rename to config/doxyfile.in
diff --git a/env/csl/CMakeLists.txt b/csl/CMakeLists.txt
similarity index 100%
rename from env/csl/CMakeLists.txt
rename to csl/CMakeLists.txt
diff --git a/env/csl/rpi/CMakeLists.txt b/csl/rpi/CMakeLists.txt
similarity index 100%
rename from env/csl/rpi/CMakeLists.txt
rename to csl/rpi/CMakeLists.txt
diff --git a/env/csl/rpi/Inc/systemCall.hpp b/csl/rpi/Inc/systemCall.hpp
similarity index 100%
rename from env/csl/rpi/Inc/systemCall.hpp
rename to csl/rpi/Inc/systemCall.hpp
diff --git a/env/csl/rpi/Src/CMakeLists.txt b/csl/rpi/Src/CMakeLists.txt
similarity index 100%
rename from env/csl/rpi/Src/CMakeLists.txt
rename to csl/rpi/Src/CMakeLists.txt
diff --git a/env/csl/rpi/Src/delay.cpp b/csl/rpi/Src/delay.cpp
similarity index 100%
rename from env/csl/rpi/Src/delay.cpp
rename to csl/rpi/Src/delay.cpp
diff --git a/env/csl/rpi/Src/gpio.cpp b/csl/rpi/Src/gpio.cpp
similarity index 100%
rename from env/csl/rpi/Src/gpio.cpp
rename to csl/rpi/Src/gpio.cpp
diff --git a/env/csl/rpi/Src/systemCall.cpp b/csl/rpi/Src/systemCall.cpp
similarity index 100%
rename from env/csl/rpi/Src/systemCall.cpp
rename to csl/rpi/Src/systemCall.cpp
diff --git a/env/csl/rpi/compiler.cmake b/csl/rpi/compiler.cmake
similarity index 100%
rename from env/csl/rpi/compiler.cmake
rename to csl/rpi/compiler.cmake
diff --git a/env/csl/rpi/config.cmake b/csl/rpi/config.cmake
similarity index 100%
rename from env/csl/rpi/config.cmake
rename to csl/rpi/config.cmake
diff --git a/env/csl/stm32f042/.mxproject b/csl/stm32f042/.mxproject
similarity index 100%
rename from env/csl/stm32f042/.mxproject
rename to csl/stm32f042/.mxproject
diff --git a/env/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/stm32f042x6.h b/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/stm32f042x6.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/stm32f042x6.h
rename to csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/stm32f042x6.h
diff --git a/env/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/stm32f0xx.h b/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/stm32f0xx.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/stm32f0xx.h
rename to csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/stm32f0xx.h
diff --git a/env/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/system_stm32f0xx.h b/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/system_stm32f0xx.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/system_stm32f0xx.h
rename to csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/system_stm32f0xx.h
diff --git a/env/csl/stm32f042/CMSIS/Include/cmsis_armcc.h b/csl/stm32f042/CMSIS/Include/cmsis_armcc.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/cmsis_armcc.h
rename to csl/stm32f042/CMSIS/Include/cmsis_armcc.h
diff --git a/env/csl/stm32f042/CMSIS/Include/cmsis_armclang.h b/csl/stm32f042/CMSIS/Include/cmsis_armclang.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/cmsis_armclang.h
rename to csl/stm32f042/CMSIS/Include/cmsis_armclang.h
diff --git a/env/csl/stm32f042/CMSIS/Include/cmsis_compiler.h b/csl/stm32f042/CMSIS/Include/cmsis_compiler.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/cmsis_compiler.h
rename to csl/stm32f042/CMSIS/Include/cmsis_compiler.h
diff --git a/env/csl/stm32f042/CMSIS/Include/cmsis_gcc.h b/csl/stm32f042/CMSIS/Include/cmsis_gcc.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/cmsis_gcc.h
rename to csl/stm32f042/CMSIS/Include/cmsis_gcc.h
diff --git a/env/csl/stm32f042/CMSIS/Include/cmsis_iccarm.h b/csl/stm32f042/CMSIS/Include/cmsis_iccarm.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/cmsis_iccarm.h
rename to csl/stm32f042/CMSIS/Include/cmsis_iccarm.h
diff --git a/env/csl/stm32f042/CMSIS/Include/cmsis_version.h b/csl/stm32f042/CMSIS/Include/cmsis_version.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/cmsis_version.h
rename to csl/stm32f042/CMSIS/Include/cmsis_version.h
diff --git a/env/csl/stm32f042/CMSIS/Include/core_armv8mbl.h b/csl/stm32f042/CMSIS/Include/core_armv8mbl.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/core_armv8mbl.h
rename to csl/stm32f042/CMSIS/Include/core_armv8mbl.h
diff --git a/env/csl/stm32f042/CMSIS/Include/core_armv8mml.h b/csl/stm32f042/CMSIS/Include/core_armv8mml.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/core_armv8mml.h
rename to csl/stm32f042/CMSIS/Include/core_armv8mml.h
diff --git a/env/csl/stm32f042/CMSIS/Include/core_cm0.h b/csl/stm32f042/CMSIS/Include/core_cm0.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/core_cm0.h
rename to csl/stm32f042/CMSIS/Include/core_cm0.h
diff --git a/env/csl/stm32f042/CMSIS/Include/core_cm0plus.h b/csl/stm32f042/CMSIS/Include/core_cm0plus.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/core_cm0plus.h
rename to csl/stm32f042/CMSIS/Include/core_cm0plus.h
diff --git a/env/csl/stm32f042/CMSIS/Include/core_cm1.h b/csl/stm32f042/CMSIS/Include/core_cm1.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/core_cm1.h
rename to csl/stm32f042/CMSIS/Include/core_cm1.h
diff --git a/env/csl/stm32f042/CMSIS/Include/core_cm23.h b/csl/stm32f042/CMSIS/Include/core_cm23.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/core_cm23.h
rename to csl/stm32f042/CMSIS/Include/core_cm23.h
diff --git a/env/csl/stm32f042/CMSIS/Include/core_cm3.h b/csl/stm32f042/CMSIS/Include/core_cm3.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/core_cm3.h
rename to csl/stm32f042/CMSIS/Include/core_cm3.h
diff --git a/env/csl/stm32f042/CMSIS/Include/core_cm33.h b/csl/stm32f042/CMSIS/Include/core_cm33.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/core_cm33.h
rename to csl/stm32f042/CMSIS/Include/core_cm33.h
diff --git a/env/csl/stm32f042/CMSIS/Include/core_cm4.h b/csl/stm32f042/CMSIS/Include/core_cm4.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/core_cm4.h
rename to csl/stm32f042/CMSIS/Include/core_cm4.h
diff --git a/env/csl/stm32f042/CMSIS/Include/core_cm7.h b/csl/stm32f042/CMSIS/Include/core_cm7.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/core_cm7.h
rename to csl/stm32f042/CMSIS/Include/core_cm7.h
diff --git a/env/csl/stm32f042/CMSIS/Include/core_sc000.h b/csl/stm32f042/CMSIS/Include/core_sc000.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/core_sc000.h
rename to csl/stm32f042/CMSIS/Include/core_sc000.h
diff --git a/env/csl/stm32f042/CMSIS/Include/core_sc300.h b/csl/stm32f042/CMSIS/Include/core_sc300.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/core_sc300.h
rename to csl/stm32f042/CMSIS/Include/core_sc300.h
diff --git a/env/csl/stm32f042/CMSIS/Include/mpu_armv7.h b/csl/stm32f042/CMSIS/Include/mpu_armv7.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/mpu_armv7.h
rename to csl/stm32f042/CMSIS/Include/mpu_armv7.h
diff --git a/env/csl/stm32f042/CMSIS/Include/mpu_armv8.h b/csl/stm32f042/CMSIS/Include/mpu_armv8.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/mpu_armv8.h
rename to csl/stm32f042/CMSIS/Include/mpu_armv8.h
diff --git a/env/csl/stm32f042/CMSIS/Include/tz_context.h b/csl/stm32f042/CMSIS/Include/tz_context.h
similarity index 100%
rename from env/csl/stm32f042/CMSIS/Include/tz_context.h
rename to csl/stm32f042/CMSIS/Include/tz_context.h
diff --git a/env/csl/stm32f042/CMakeLists.txt b/csl/stm32f042/CMakeLists.txt
similarity index 100%
rename from env/csl/stm32f042/CMakeLists.txt
rename to csl/stm32f042/CMakeLists.txt
diff --git a/env/csl/stm32f042/Device/hardwareDescription.h b/csl/stm32f042/Device/hardwareDescription.h
similarity index 100%
rename from env/csl/stm32f042/Device/hardwareDescription.h
rename to csl/stm32f042/Device/hardwareDescription.h
diff --git a/env/csl/stm32f042/Device/stm32f042x6.h b/csl/stm32f042/Device/stm32f042x6.h
similarity index 100%
rename from env/csl/stm32f042/Device/stm32f042x6.h
rename to csl/stm32f042/Device/stm32f042x6.h
diff --git a/env/csl/stm32f042/Device/stm32f0xx.h b/csl/stm32f042/Device/stm32f0xx.h
similarity index 100%
rename from env/csl/stm32f042/Device/stm32f0xx.h
rename to csl/stm32f042/Device/stm32f0xx.h
diff --git a/env/csl/stm32f042/Device/system_stm32f0xx.h b/csl/stm32f042/Device/system_stm32f0xx.h
similarity index 100%
rename from env/csl/stm32f042/Device/system_stm32f0xx.h
rename to csl/stm32f042/Device/system_stm32f0xx.h
diff --git a/env/csl/stm32f042/Docs/NXP_UM11126.pdf b/csl/stm32f042/Docs/NXP_UM11126.pdf
similarity index 100%
rename from env/csl/stm32f042/Docs/NXP_UM11126.pdf
rename to csl/stm32f042/Docs/NXP_UM11126.pdf
diff --git a/env/csl/stm32f042/Docs/dm00031936-stm32f0x1stm32f0x2.pdf b/csl/stm32f042/Docs/dm00031936-stm32f0x1stm32f0x2.pdf
similarity index 100%
rename from env/csl/stm32f042/Docs/dm00031936-stm32f0x1stm32f0x2.pdf
rename to csl/stm32f042/Docs/dm00031936-stm32f0x1stm32f0x2.pdf
diff --git a/env/csl/stm32f042/Docs/stm32f042k6.pdf b/csl/stm32f042/Docs/stm32f042k6.pdf
similarity index 100%
rename from env/csl/stm32f042/Docs/stm32f042k6.pdf
rename to csl/stm32f042/Docs/stm32f042k6.pdf
diff --git a/env/csl/stm32f042/Src/CMakeLists.txt b/csl/stm32f042/Src/CMakeLists.txt
similarity index 100%
rename from env/csl/stm32f042/Src/CMakeLists.txt
rename to csl/stm32f042/Src/CMakeLists.txt
diff --git a/env/csl/stm32f042/Src/deviceSetup.c b/csl/stm32f042/Src/deviceSetup.c
similarity index 100%
rename from env/csl/stm32f042/Src/deviceSetup.c
rename to csl/stm32f042/Src/deviceSetup.c
diff --git a/env/csl/stm32f042/Src/imp_delay.c b/csl/stm32f042/Src/imp_delay.c
similarity index 100%
rename from env/csl/stm32f042/Src/imp_delay.c
rename to csl/stm32f042/Src/imp_delay.c
diff --git a/env/csl/stm32f042/Src/imp_i2c.c b/csl/stm32f042/Src/imp_i2c.c
similarity index 100%
rename from env/csl/stm32f042/Src/imp_i2c.c
rename to csl/stm32f042/Src/imp_i2c.c
diff --git a/env/csl/stm32f042/Src/imp_pin.c b/csl/stm32f042/Src/imp_pin.c
similarity index 100%
rename from env/csl/stm32f042/Src/imp_pin.c
rename to csl/stm32f042/Src/imp_pin.c
diff --git a/env/csl/stm32f042/Src/imp_spi.c b/csl/stm32f042/Src/imp_spi.c
similarity index 100%
rename from env/csl/stm32f042/Src/imp_spi.c
rename to csl/stm32f042/Src/imp_spi.c
diff --git a/env/csl/stm32f042/Src/imp_timer.c b/csl/stm32f042/Src/imp_timer.c
similarity index 100%
rename from env/csl/stm32f042/Src/imp_timer.c
rename to csl/stm32f042/Src/imp_timer.c
diff --git a/env/csl/stm32f042/Src/imp_usart.c b/csl/stm32f042/Src/imp_usart.c
similarity index 100%
rename from env/csl/stm32f042/Src/imp_usart.c
rename to csl/stm32f042/Src/imp_usart.c
diff --git a/env/csl/stm32f042/config.cmake b/csl/stm32f042/config.cmake
similarity index 100%
rename from env/csl/stm32f042/config.cmake
rename to csl/stm32f042/config.cmake
diff --git a/env/csl/stm32f042/startup/CMakeLists.txt b/csl/stm32f042/startup/CMakeLists.txt
similarity index 100%
rename from env/csl/stm32f042/startup/CMakeLists.txt
rename to csl/stm32f042/startup/CMakeLists.txt
diff --git a/env/csl/stm32f042/startup/STM32F042K6Tx_FLASH.ld b/csl/stm32f042/startup/STM32F042K6Tx_FLASH.ld
similarity index 100%
rename from env/csl/stm32f042/startup/STM32F042K6Tx_FLASH.ld
rename to csl/stm32f042/startup/STM32F042K6Tx_FLASH.ld
diff --git a/env/csl/stm32f042/startup/startup_stm32f042x6.s b/csl/stm32f042/startup/startup_stm32f042x6.s
similarity index 100%
rename from env/csl/stm32f042/startup/startup_stm32f042x6.s
rename to csl/stm32f042/startup/startup_stm32f042x6.s
diff --git a/env/drivers/CMakeLists.txt b/drivers/CMakeLists.txt
similarity index 100%
rename from env/drivers/CMakeLists.txt
rename to drivers/CMakeLists.txt
diff --git a/env/drivers/MCP4725/mcp4725.hpp b/drivers/MCP4725/mcp4725.hpp
similarity index 100%
rename from env/drivers/MCP4725/mcp4725.hpp
rename to drivers/MCP4725/mcp4725.hpp
diff --git a/env/drivers/max31865/CMakeLists.txt b/drivers/max31865/CMakeLists.txt
similarity index 100%
rename from env/drivers/max31865/CMakeLists.txt
rename to drivers/max31865/CMakeLists.txt
diff --git a/env/drivers/max31865/max31865.c b/drivers/max31865/max31865.c
similarity index 100%
rename from env/drivers/max31865/max31865.c
rename to drivers/max31865/max31865.c
diff --git a/env/drivers/max31865/max31865.h b/drivers/max31865/max31865.h
similarity index 100%
rename from env/drivers/max31865/max31865.h
rename to drivers/max31865/max31865.h
diff --git a/env/drivers/max7219/CMakeLists.txt b/drivers/max7219/CMakeLists.txt
similarity index 100%
rename from env/drivers/max7219/CMakeLists.txt
rename to drivers/max7219/CMakeLists.txt
diff --git a/env/drivers/max7219/max7219.c b/drivers/max7219/max7219.c
similarity index 100%
rename from env/drivers/max7219/max7219.c
rename to drivers/max7219/max7219.c
diff --git a/env/drivers/max7219/max7219.h b/drivers/max7219/max7219.h
similarity index 100%
rename from env/drivers/max7219/max7219.h
rename to drivers/max7219/max7219.h
diff --git a/env/drivers/max7219/new_max7219.c b/drivers/max7219/new_max7219.c
similarity index 100%
rename from env/drivers/max7219/new_max7219.c
rename to drivers/max7219/new_max7219.c
diff --git a/env/drivers/max7219/new_max7219.h b/drivers/max7219/new_max7219.h
similarity index 100%
rename from env/drivers/max7219/new_max7219.h
rename to drivers/max7219/new_max7219.h
diff --git a/env/periferals/CMakeLists.txt b/periferals/CMakeLists.txt
similarity index 100%
rename from env/periferals/CMakeLists.txt
rename to periferals/CMakeLists.txt
diff --git a/env/periferals/ascii.h b/periferals/ascii.h
similarity index 100%
rename from env/periferals/ascii.h
rename to periferals/ascii.h
diff --git a/env/periferals/delay.h b/periferals/delay.h
similarity index 100%
rename from env/periferals/delay.h
rename to periferals/delay.h
diff --git a/env/periferals/deviceSetup.h b/periferals/deviceSetup.h
similarity index 100%
rename from env/periferals/deviceSetup.h
rename to periferals/deviceSetup.h
diff --git a/env/periferals/i2c.c b/periferals/i2c.c
similarity index 100%
rename from env/periferals/i2c.c
rename to periferals/i2c.c
diff --git a/env/periferals/i2c.h b/periferals/i2c.h
similarity index 100%
rename from env/periferals/i2c.h
rename to periferals/i2c.h
diff --git a/env/periferals/pin.h b/periferals/pin.h
similarity index 100%
rename from env/periferals/pin.h
rename to periferals/pin.h
diff --git a/env/periferals/spi.c b/periferals/spi.c
similarity index 100%
rename from env/periferals/spi.c
rename to periferals/spi.c
diff --git a/env/periferals/spi.h b/periferals/spi.h
similarity index 100%
rename from env/periferals/spi.h
rename to periferals/spi.h
diff --git a/env/periferals/timer.h b/periferals/timer.h
similarity index 100%
rename from env/periferals/timer.h
rename to periferals/timer.h
diff --git a/env/periferals/usart.h b/periferals/usart.h
similarity index 100%
rename from env/periferals/usart.h
rename to periferals/usart.h
diff --git a/run.sh b/run.sh
index 2cdcb6b..81eb70b 100755
--- a/run.sh
+++ b/run.sh
@@ -4,9 +4,7 @@ CSL_TO_USE=$1
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 FILE=$SCRIPT_DIR/../ked_build
-cd $SCRIPT_DIR/env
-
-
+cd $SCRIPT_DIR
 
 
 build()
@@ -70,15 +68,8 @@ build()
 
 autoInit()
 {
-	if [[ -f "../main.c" ]];then
-		if [[ -f "../main.h" ]];then
+	if [[ -f "$SCRIPT_DIR/../main.c" ]];then
 			build
-		else
-			echo "Main.h is not found"
-			echo "Creating sample project"
-			cp $SCRIPT_DIR/examples/autoInit/main.* $SCRIPT_DIR/../
-			build
-		fi
 	else
 		echo "Main.c is not fount"
 		echo "Creating sample project"
diff --git a/env/utils/BitFiled.hpp b/utils/BitFiled.hpp
similarity index 100%
rename from env/utils/BitFiled.hpp
rename to utils/BitFiled.hpp
diff --git a/env/utils/CMakeLists.txt b/utils/CMakeLists.txt
similarity index 100%
rename from env/utils/CMakeLists.txt
rename to utils/CMakeLists.txt
diff --git a/env/utils/assert/CMakeLists.txt b/utils/assert/CMakeLists.txt
similarity index 100%
rename from env/utils/assert/CMakeLists.txt
rename to utils/assert/CMakeLists.txt
diff --git a/env/utils/assert/utils_assert.c b/utils/assert/utils_assert.c
similarity index 100%
rename from env/utils/assert/utils_assert.c
rename to utils/assert/utils_assert.c
diff --git a/env/utils/assert/utils_assert.h b/utils/assert/utils_assert.h
similarity index 100%
rename from env/utils/assert/utils_assert.h
rename to utils/assert/utils_assert.h
diff --git a/env/utils/commandManager/commandManager.cpp b/utils/commandManager/commandManager.cpp
similarity index 100%
rename from env/utils/commandManager/commandManager.cpp
rename to utils/commandManager/commandManager.cpp
diff --git a/env/utils/commandManager/commandManager.h b/utils/commandManager/commandManager.h
similarity index 100%
rename from env/utils/commandManager/commandManager.h
rename to utils/commandManager/commandManager.h
diff --git a/env/utils/menu/CMakeLists.txt b/utils/menu/CMakeLists.txt
similarity index 100%
rename from env/utils/menu/CMakeLists.txt
rename to utils/menu/CMakeLists.txt
diff --git a/env/utils/menu/utils_menu.c b/utils/menu/utils_menu.c
similarity index 100%
rename from env/utils/menu/utils_menu.c
rename to utils/menu/utils_menu.c
diff --git a/env/utils/menu/utils_menu.h b/utils/menu/utils_menu.h
similarity index 100%
rename from env/utils/menu/utils_menu.h
rename to utils/menu/utils_menu.h