diff --git a/.gitignore b/.gitignore
index 84fdf05e..d936712c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 .code-workspace
 .helper/
 /sd-card/htm./.vscode/
+/code/build
 
 CMakeLists.txt.user
 CMakeCache.txt
diff --git a/README.md b/README.md
index 05857edc..df26fecd 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,14 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571
 
 **General remark:** Beside the `firmware.bin`, typically also the content of `/html` needs to be updated!
 
+##### Rolling - (2020-12-03)
+
+* Move source code to `/main` to full compatibility between pure ESP-IDF and Platformio w/ espressif
+
+* based on Main v4.1.1 (2020-12-02)
+
+  
+
 ##### 4.1.1 Configuration editor - (2020-12-02)
 
 * Bug fixing: internal improvement of file handling (reduce not responding)
diff --git a/code/src/CMakeLists.txt b/code/main/CMakeLists.txt
similarity index 97%
rename from code/src/CMakeLists.txt
rename to code/main/CMakeLists.txt
index 64236268..9e34818e 100644
--- a/code/src/CMakeLists.txt
+++ b/code/main/CMakeLists.txt
@@ -53,7 +53,7 @@ endif()
 #######################################################################
 
 
-FILE(GLOB_RECURSE app_sources ${CMAKE_SOURCE_DIR}/src/*.*)
+FILE(GLOB_RECURSE app_sources ${CMAKE_SOURCE_DIR}/main/*.*)
 
 # idf_component_register(SRCS ${app_sources})
 
diff --git a/code/src/favicon.ico b/code/main/favicon.ico
similarity index 100%
rename from code/src/favicon.ico
rename to code/main/favicon.ico
diff --git a/code/src/gitversion.cmake b/code/main/gitversion.cmake
similarity index 100%
rename from code/src/gitversion.cmake
rename to code/main/gitversion.cmake
diff --git a/code/src/main.cpp b/code/main/main.cpp
similarity index 100%
rename from code/src/main.cpp
rename to code/main/main.cpp
diff --git a/code/src/server_main.cpp b/code/main/server_main.cpp
similarity index 100%
rename from code/src/server_main.cpp
rename to code/main/server_main.cpp
diff --git a/code/src/server_main.h b/code/main/server_main.h
similarity index 100%
rename from code/src/server_main.h
rename to code/main/server_main.h
diff --git a/code/main/version.cpp b/code/main/version.cpp
new file mode 100644
index 00000000..13849b65
--- /dev/null
+++ b/code/main/version.cpp
@@ -0,0 +1,4 @@
+const char* GIT_REV="c5059b4";
+const char* GIT_TAG="";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2020-12-03 20:31";
\ No newline at end of file
diff --git a/code/src/version.h b/code/main/version.h
similarity index 100%
rename from code/src/version.h
rename to code/main/version.h
diff --git a/code/platformio.ini b/code/platformio.ini
index 44019c36..43ce1528 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -9,6 +9,8 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 
+[platformio]
+src_dir = main
 
 
 [env:esp32cam]
@@ -17,12 +19,14 @@ board = esp32cam
 framework = espidf
 
 board_build.embed_files  =
-  src/favicon.ico
+  main/favicon.ico
 
 
 ;board_build.partitions = partitions_singleapp.csv
 board_build.partitions = partitions.csv
 
+
+
 lib_deps = 
   jomjol_helper 
   connect_wlan  
diff --git a/code/src/version.cpp b/code/src/version.cpp
deleted file mode 100644
index ba1b9571..00000000
--- a/code/src/version.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-const char* GIT_REV="ffc15aa";
-const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2020-12-02 21:56";
\ No newline at end of file
diff --git a/code/version.cpp b/code/version.cpp
index 1afca8ab..167604ec 100644
--- a/code/version.cpp
+++ b/code/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="ffc15aa";
+const char* GIT_REV="c5059b4";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2020-12-02 21:55";
\ No newline at end of file
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2020-12-03 20:27";
\ No newline at end of file