diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index e09c158..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 9a8a9c7..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,34 +0,0 @@
-*.rar
-*.o
-*.d
-*.crf
-*.htm
-*.dep
-*.map
-*.bak
-*.lnp
-*.lst
-*.ini
-*.iex
-*.sct
-*.scvd
-*.uvguix
-*.dbg*
-*.uvguix.*
-.mxproject
- 
-RTE/
-Templates/
-Examples/
- 
-!*.uvprojx
-!*.h
-!*.c
-!*.ioc
-!*.axf
-!*.bin
-!*.hex
-
-build/
-dist/
-*.spec
\ No newline at end of file
diff --git a/User/.DS_Store b/User/.DS_Store
deleted file mode 100644
index cf5987b..0000000
Binary files a/User/.DS_Store and /dev/null differ
diff --git a/User/bsp/.DS_Store b/bsp/.DS_Store
similarity index 100%
rename from User/bsp/.DS_Store
rename to bsp/.DS_Store
diff --git a/User/bsp/.gitkeep b/bsp/.gitkeep
similarity index 100%
rename from User/bsp/.gitkeep
rename to bsp/.gitkeep
diff --git a/User/bsp/bsp.h b/bsp/bsp.h
similarity index 100%
rename from User/bsp/bsp.h
rename to bsp/bsp.h
diff --git a/User/bsp/buzzer_gpio.c b/bsp/buzzer_gpio.c
similarity index 100%
rename from User/bsp/buzzer_gpio.c
rename to bsp/buzzer_gpio.c
diff --git a/User/bsp/buzzer_gpio.h b/bsp/buzzer_gpio.h
similarity index 100%
rename from User/bsp/buzzer_gpio.h
rename to bsp/buzzer_gpio.h
diff --git a/User/bsp/can.c b/bsp/can.c
similarity index 100%
rename from User/bsp/can.c
rename to bsp/can.c
diff --git a/User/bsp/can.h b/bsp/can.h
similarity index 100%
rename from User/bsp/can.h
rename to bsp/can.h
diff --git a/User/bsp/delay.c b/bsp/delay.c
similarity index 100%
rename from User/bsp/delay.c
rename to bsp/delay.c
diff --git a/User/bsp/delay.h b/bsp/delay.h
similarity index 100%
rename from User/bsp/delay.h
rename to bsp/delay.h
diff --git a/User/bsp/dependencies.csv b/bsp/dependencies.csv
similarity index 100%
rename from User/bsp/dependencies.csv
rename to bsp/dependencies.csv
diff --git a/User/bsp/gpio_exti.c b/bsp/gpio_exti.c
similarity index 100%
rename from User/bsp/gpio_exti.c
rename to bsp/gpio_exti.c
diff --git a/User/bsp/gpio_exti.h b/bsp/gpio_exti.h
similarity index 100%
rename from User/bsp/gpio_exti.h
rename to bsp/gpio_exti.h
diff --git a/User/bsp/i2c.c b/bsp/i2c.c
similarity index 100%
rename from User/bsp/i2c.c
rename to bsp/i2c.c
diff --git a/User/bsp/i2c.h b/bsp/i2c.h
similarity index 100%
rename from User/bsp/i2c.h
rename to bsp/i2c.h
diff --git a/User/bsp/led_gpio.c b/bsp/led_gpio.c
similarity index 100%
rename from User/bsp/led_gpio.c
rename to bsp/led_gpio.c
diff --git a/User/bsp/led_gpio.h b/bsp/led_gpio.h
similarity index 100%
rename from User/bsp/led_gpio.h
rename to bsp/led_gpio.h
diff --git a/User/bsp/servo_pwm.c b/bsp/servo_pwm.c
similarity index 100%
rename from User/bsp/servo_pwm.c
rename to bsp/servo_pwm.c
diff --git a/User/bsp/servo_pwm.h b/bsp/servo_pwm.h
similarity index 100%
rename from User/bsp/servo_pwm.h
rename to bsp/servo_pwm.h
diff --git a/User/bsp/spi.c b/bsp/spi.c
similarity index 100%
rename from User/bsp/spi.c
rename to bsp/spi.c
diff --git a/User/bsp/spi.h b/bsp/spi.h
similarity index 100%
rename from User/bsp/spi.h
rename to bsp/spi.h
diff --git a/User/bsp/uart.c b/bsp/uart.c
similarity index 100%
rename from User/bsp/uart.c
rename to bsp/uart.c
diff --git a/User/bsp/uart.h b/bsp/uart.h
similarity index 100%
rename from User/bsp/uart.h
rename to bsp/uart.h
diff --git a/User/component/.gitkeep b/component/.gitkeep
similarity index 100%
rename from User/component/.gitkeep
rename to component/.gitkeep
diff --git a/User/component/crc16_rm.c b/component/crc16_rm.c
similarity index 100%
rename from User/component/crc16_rm.c
rename to component/crc16_rm.c
diff --git a/User/component/crc16_rm.h b/component/crc16_rm.h
similarity index 100%
rename from User/component/crc16_rm.h
rename to component/crc16_rm.h
diff --git a/User/component/crc8_rm.c b/component/crc8_rm.c
similarity index 100%
rename from User/component/crc8_rm.c
rename to component/crc8_rm.c
diff --git a/User/component/crc8_rm.h b/component/crc8_rm.h
similarity index 100%
rename from User/component/crc8_rm.h
rename to component/crc8_rm.h
diff --git a/User/component/dependencies.csv b/component/dependencies.csv
similarity index 100%
rename from User/component/dependencies.csv
rename to component/dependencies.csv
diff --git a/User/component/filter.c b/component/filter.c
similarity index 100%
rename from User/component/filter.c
rename to component/filter.c
diff --git a/User/component/filter.h b/component/filter.h
similarity index 100%
rename from User/component/filter.h
rename to component/filter.h
diff --git a/User/component/pid.c b/component/pid.c
similarity index 100%
rename from User/component/pid.c
rename to component/pid.c
diff --git a/User/component/pid.h b/component/pid.h
similarity index 100%
rename from User/component/pid.h
rename to component/pid.h
diff --git a/User/component/user_math.c b/component/user_math.c
similarity index 100%
rename from User/component/user_math.c
rename to component/user_math.c
diff --git a/User/component/user_math.h b/component/user_math.h
similarity index 100%
rename from User/component/user_math.h
rename to component/user_math.h
diff --git a/User/device/.DS_Store b/device/.DS_Store
similarity index 100%
rename from User/device/.DS_Store
rename to device/.DS_Store
diff --git a/User/device/.gitkeep b/device/.gitkeep
similarity index 100%
rename from User/device/.gitkeep
rename to device/.gitkeep
diff --git a/User/device/bmp280_i2c.c b/device/bmp280_i2c.c
similarity index 100%
rename from User/device/bmp280_i2c.c
rename to device/bmp280_i2c.c
diff --git a/User/device/bmp280_i2c.h b/device/bmp280_i2c.h
similarity index 100%
rename from User/device/bmp280_i2c.h
rename to device/bmp280_i2c.h
diff --git a/User/device/dependencies.csv b/device/dependencies.csv
similarity index 100%
rename from User/device/dependencies.csv
rename to device/dependencies.csv
diff --git a/User/device/device.h b/device/device.h
similarity index 100%
rename from User/device/device.h
rename to device/device.h
diff --git a/User/device/key_gpio.c b/device/key_gpio.c
similarity index 100%
rename from User/device/key_gpio.c
rename to device/key_gpio.c
diff --git a/User/device/key_gpio.h b/device/key_gpio.h
similarity index 100%
rename from User/device/key_gpio.h
rename to device/key_gpio.h
diff --git a/User/device/oled_i2c.c b/device/oled_i2c.c
similarity index 100%
rename from User/device/oled_i2c.c
rename to device/oled_i2c.c
diff --git a/User/device/oled_i2c.h b/device/oled_i2c.h
similarity index 100%
rename from User/device/oled_i2c.h
rename to device/oled_i2c.h
diff --git a/User/device/pc_uart.c b/device/pc_uart.c
similarity index 100%
rename from User/device/pc_uart.c
rename to device/pc_uart.c
diff --git a/User/device/pc_uart.h b/device/pc_uart.h
similarity index 100%
rename from User/device/pc_uart.h
rename to device/pc_uart.h
diff --git a/User/device/servo.c b/device/servo.c
similarity index 100%
rename from User/device/servo.c
rename to device/servo.c
diff --git a/User/device/servo.h b/device/servo.h
similarity index 100%
rename from User/device/servo.h
rename to device/servo.h
diff --git a/User/module/.gitkeep b/module/.gitkeep
similarity index 100%
rename from User/module/.gitkeep
rename to module/.gitkeep
diff --git a/User/module/config.c b/module/config.c
similarity index 100%
rename from User/module/config.c
rename to module/config.c
diff --git a/User/module/config.h b/module/config.h
similarity index 100%
rename from User/module/config.h
rename to module/config.h
diff --git a/User/task/.gitkeep b/task/.gitkeep
similarity index 100%
rename from User/task/.gitkeep
rename to task/.gitkeep
diff --git a/User/task/init.c.template b/task/init.c.template
similarity index 100%
rename from User/task/init.c.template
rename to task/init.c.template
diff --git a/User/task/task.c.template b/task/task.c.template
similarity index 100%
rename from User/task/task.c.template
rename to task/task.c.template
diff --git a/User/task/user_task.c.template b/task/user_task.c.template
similarity index 100%
rename from User/task/user_task.c.template
rename to task/user_task.c.template
diff --git a/User/task/user_task.h.template b/task/user_task.h.template
similarity index 100%
rename from User/task/user_task.h.template
rename to task/user_task.h.template