diff --git a/sdkconfig.seeed_xiao_esp32c6 b/sdkconfig.seeed_xiao_esp32c6
index ca0ec4e..a8e539f 100644
--- a/sdkconfig.seeed_xiao_esp32c6
+++ b/sdkconfig.seeed_xiao_esp32c6
@@ -132,7 +132,6 @@ CONFIG_SOC_GPIO_DEEP_SLEEP_WAKE_VALID_GPIO_MASK=0
 CONFIG_SOC_GPIO_DEEP_SLEEP_WAKE_SUPPORTED_PIN_CNT=8
 CONFIG_SOC_GPIO_VALID_DIGITAL_IO_PAD_MASK=0x000000007FFFFF00
 CONFIG_SOC_GPIO_SUPPORT_FORCE_HOLD=y
-CONFIG_SOC_GPIO_SUPPORT_HOLD_IO_IN_DSLP=y
 CONFIG_SOC_GPIO_SUPPORT_HOLD_SINGLE_IO_IN_DSLP=y
 CONFIG_SOC_GPIO_CLOCKOUT_BY_GPIO_MATRIX=y
 CONFIG_SOC_CLOCKOUT_HAS_SOURCE_GATE=y
@@ -2344,13 +2343,6 @@ CONFIG_LIBC_TIME_SYSCALL_USE_RTC_HRT=y
 #
 # CONFIG_OPENTHREAD_ENABLED is not set
 
-#
-# Thread Console
-#
-CONFIG_OPENTHREAD_CLI=y
-CONFIG_OPENTHREAD_CONSOLE_COMMAND_PREFIX="ot"
-# end of Thread Console
-
 #
 # OpenThread Spinel
 #
diff --git a/include/BLE.cpp b/src/BLE.cpp
similarity index 100%
rename from include/BLE.cpp
rename to src/BLE.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0848ada..e3e1ef0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 # This file was automatically generated for projects
 # without default 'CMakeLists.txt' file.
 
-FILE(GLOB_RECURSE app_sources ${CMAKE_SOURCE_DIR}/src/*.* ${CMAKE_SOURCE_DIR}/include/*.cpp)
+FILE(GLOB_RECURSE app_sources ${CMAKE_SOURCE_DIR}/src/*.*)
 
 idf_component_register(SRCS ${app_sources}
                     INCLUDE_DIRS "."
diff --git a/include/WiFi.cpp b/src/WiFi.cpp
similarity index 100%
rename from include/WiFi.cpp
rename to src/WiFi.cpp
diff --git a/include/bmHTTP.cpp b/src/bmHTTP.cpp
similarity index 100%
rename from include/bmHTTP.cpp
rename to src/bmHTTP.cpp
diff --git a/include/calibration.cpp b/src/calibration.cpp
similarity index 100%
rename from include/calibration.cpp
rename to src/calibration.cpp
diff --git a/include/encoder.cpp b/src/encoder.cpp
similarity index 100%
rename from include/encoder.cpp
rename to src/encoder.cpp
diff --git a/src/main.cpp b/src/main.cpp
index a1aafe4..8cf1563 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,6 +18,17 @@ Encoder* bottomEnc = new Encoder(InputEnc_PIN_A, InputEnc_PIN_B);
 // Global calibration instance
 Calibration calib;
 
+void switchOnOffServo() {
+  while (1) {
+    printf("Servo On\n");
+    servoOn(CCW, manual);
+    vTaskDelay(pdMS_TO_TICKS(2000));
+    printf("Servo Off\n");
+    servoOff();
+    vTaskDelay(pdMS_TO_TICKS(2000));
+  }
+}
+
 void mainApp() {
   esp_err_t ret = nvs_flash_init(); // change to secure init logic soon!!
   // 2. If NVS is full or corrupt (common after flashing new code), erase and retry
@@ -35,6 +46,8 @@ void mainApp() {
   bottomEnc->init();
   servoInit();
 
+  // switchOnOffServo();
+
   setupLoop();
   
   statusResolved = false;
diff --git a/include/servo.cpp b/src/servo.cpp
similarity index 99%
rename from include/servo.cpp
rename to src/servo.cpp
index 1ff88d4..1a128bf 100644
--- a/include/servo.cpp
+++ b/src/servo.cpp
@@ -38,6 +38,7 @@ void servoInit() {
   ESP_ERROR_CHECK(ledc_channel_config(&ledc_channel));
 
   // Configure servo power switch pin as output
+  gpio_reset_pin(servoSwitch);
   gpio_set_direction(servoSwitch, GPIO_MODE_OUTPUT);
   gpio_set_level(servoSwitch, 0); // Start with servo power off
 
diff --git a/include/setup.cpp b/src/setup.cpp
similarity index 100%
rename from include/setup.cpp
rename to src/setup.cpp
diff --git a/include/socketIO.cpp b/src/socketIO.cpp
similarity index 100%
rename from include/socketIO.cpp
rename to src/socketIO.cpp