diff --git a/.gitignore b/.gitignore
index 37a795de0..8805fcc9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,9 @@
 output/**
 **/*.o
 **/*.obj
+*.idb
+*.exe
+*.pdb
+*.ncb
 **/*.d
 /custom.mk
diff --git a/src/httpserver/http_tcp_server.c b/src/httpserver/http_tcp_server.c
index 768625bd5..a8a6b3b62 100644
--- a/src/httpserver/http_tcp_server.c
+++ b/src/httpserver/http_tcp_server.c
@@ -28,7 +28,7 @@ static void tcp_client_thread( beken_thread_arg_t arg );
 
 xTaskHandle g_http_thread = NULL;
 
-void start_tcp_http()
+void HTTPServer_Start()
 {
     OSStatus err = kNoErr;
 
diff --git a/src/httpserver/http_tcp_server.h b/src/httpserver/http_tcp_server.h
index b4ebf82b1..ba803a6c8 100644
--- a/src/httpserver/http_tcp_server.h
+++ b/src/httpserver/http_tcp_server.h
@@ -1,2 +1,2 @@
 
-void start_tcp_http();
+void HTTPServer_Start();
diff --git a/src/user_main.c b/src/user_main.c
index 1011eb5bb..ad315ab33 100644
--- a/src/user_main.c
+++ b/src/user_main.c
@@ -43,25 +43,23 @@
 #include "driver/drv_ntp.h"
 
 static int g_secondsElapsed = 0;
-
+// open access point after this number of seconds
 static int g_openAP = 0;
+// connect to wifi after this number of seconds
 static int g_connectToWiFi = 0;
+// many boots failed? do not run pins or anything risky
 static int bSafeMode = 0;
-
-// reset in this number of seconds
+// reset after this number of seconds
 static int g_reset = 0;
-beken_timer_t g_main_timer_1s;
-
 // save config in this number of seconds
 int g_savecfg = 0;
+// main timer tick every 1s
+beken_timer_t g_main_timer_1s;
 
 int g_bHasWiFiConnected = 0;
 
 #define LOG_FEATURE LOG_FEATURE_MAIN
 
-// from wlan_ui.c
-void bk_reboot(void);
-
 
 void RESET_ScheduleModuleReset(int delSeconds) {
 	g_reset = delSeconds;
@@ -71,6 +69,9 @@ int Time_getUpTimeSeconds() {
 	return g_secondsElapsed;
 }
 
+// from wlan_ui.c
+void bk_reboot(void);
+
 // receives status change notifications about wireless - could be useful
 // ctxt is pointer to a rw_evt_type
 void wl_status( void *ctxt ){
@@ -127,11 +128,11 @@ void wl_status( void *ctxt ){
 
 // from wlan_ui.c, no header
 void bk_wlan_status_register_cb(FUNC_1PARAM_PTR cb);
-static int setup_wifi_open_access_point(void);
+static int HAL_SetupWiFiOpenAccessPoint(void);
 
 
 
-void connect_to_wifi(const char *oob_ssid,const char *connect_key)
+void HAL_ConnectToWiFi(const char *oob_ssid,const char *connect_key)
 {
 #if 1
 	network_InitTypeDef_adv_st	wNetConfigAdv;
@@ -170,7 +171,7 @@ void connect_to_wifi(const char *oob_ssid,const char *connect_key)
 
 
 
-static void app_led_timer_handler(void *data)
+static void Main_OnEverySecond(void *data)
 {
 	// run_adc_test();
 	MQTT_RunEverySecondUpdate();
@@ -193,7 +194,7 @@ static void app_led_timer_handler(void *data)
   if (g_openAP){
     g_openAP--;
     if (0 == g_openAP){
-      setup_wifi_open_access_point();
+      HAL_SetupWiFiOpenAccessPoint();
     }
   }
   if(g_connectToWiFi){
@@ -202,7 +203,7 @@ static void app_led_timer_handler(void *data)
 		const char *wifi_ssid, *wifi_pass;
 		wifi_ssid = CFG_GetWiFiSSID();
 		wifi_pass = CFG_GetWiFiPass();
-		connect_to_wifi(wifi_ssid,wifi_pass);
+		HAL_ConnectToWiFi(wifi_ssid,wifi_pass);
 		// register function to get callbacks about wifi changes.
 		bk_wlan_status_register_cb(wl_status);
 		ADDLOGF_DEBUG("Registered for wifi changes\r\n");
@@ -238,7 +239,7 @@ void app_on_generic_dbl_click(int btnIndex)
 }
 
 
-static int setup_wifi_open_access_point(void)
+static int HAL_SetupWiFiOpenAccessPoint(void)
 {
     //#define APP_DRONE_DEF_SSID          "WIFI_UPV_000000"
     #define APP_DRONE_DEF_NET_IP        "192.168.4.1"
@@ -346,7 +347,7 @@ void user_main(void)
 	if(*wifi_ssid == 0 || *wifi_pass == 0 || bForceOpenAP) {
 		// start AP mode in 5 seconds
 		g_openAP = 5;
-		//setup_wifi_open_access_point();
+		//HAL_SetupWiFiOpenAccessPoint();
 	} else {
 		g_connectToWiFi = 5;
 	}
@@ -357,7 +358,7 @@ void user_main(void)
 	// NOT WORKING, I done it other way, see ethernetif.c
 	//net_dhcp_hostname_set(g_shortDeviceName);
 
-	start_tcp_http();
+	HTTPServer_Start();
 	ADDLOGF_DEBUG("Started http tcp server\r\n");
 
   // only initialise certain things if we are not in AP mode
@@ -407,7 +408,7 @@ void user_main(void)
 
   err = rtos_init_timer(&g_main_timer_1s,
                         1 * 1000,
-                        app_led_timer_handler,
+                        Main_OnEverySecond,
                         (void *)0);
   ASSERT(kNoErr == err);
 
diff --git a/windowsTest_msvc2008.vcproj b/windowsTest_msvc2008.vcproj
index 9f6042eff..59094c97d 100644
--- a/windowsTest_msvc2008.vcproj
+++ b/windowsTest_msvc2008.vcproj
@@ -211,26 +211,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath=".\src\drv_main.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\drv_tuyaMCU.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\drv_uart.c"
-				>
-			</File>
 			<File
 				RelativePath=".\src\flash_config\flash_config.c"
 				>
@@ -331,14 +311,6 @@
 				RelativePath=".\src\new_pins.c"
 				>
 			</File>
-			<File
-				RelativePath=".\src\cmnds\newLEDDriver.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\ntp_time.c"
-				>
-			</File>
 			<File
 				RelativePath=".\src\ota\ota.c"
 				>
@@ -383,10 +355,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath=".\src\cmnds\taslike.c"
-				>
-			</File>
 			<File
 				RelativePath=".\src\user_main.c"
 				>
@@ -796,6 +764,10 @@
 				RelativePath=".\src\driver\drv_main.c"
 				>
 			</File>
+			<File
+				RelativePath=".\src\driver\drv_ntp.c"
+				>
+			</File>
 			<File
 				RelativePath=".\src\driver\drv_public.h"
 				>