diff --git a/.gitignore b/.gitignore
index 98dcbb02..cb627492 100644
--- a/.gitignore
+++ b/.gitignore
@@ -312,3 +312,6 @@ test/sanity-check/c++17/cmake_install.cmake
 test/sanity-check/c++17/CMakeCache.txt
 test/sanity-check/c++17/libt17.a
 test/sanity-check/c++17/Makefile
+test/vs2019/Debug LLVM
+test/vs2019/DebugLLVMNoSTL
+test/vs2019/DebugNoSTL
diff --git a/arduino/create_arduino_library.py b/arduino/create_arduino_library.py
index 97924e7f..f7c7c7e9 100644
--- a/arduino/create_arduino_library.py
+++ b/arduino/create_arduino_library.py
@@ -28,7 +28,7 @@ include_dir = os.path.join(etl_dir, 'include')
 print('include_dir         = ', include_dir)
 
 # Get the ETL arduino_examples folder
-arduino_examples_dir = os.path.join(etl_dir, 'arduino_examples')
+arduino_examples_dir = os.path.join(arduino_dir, 'examples')
 print('examples_dir        = ', arduino_examples_dir)
 
 # Get the root folder of both repositories
@@ -84,7 +84,7 @@ print('')
 # Copy the ETL arduino_examples
 source      = arduino_examples_dir
 destination = etl_arduino_examples_dir
-print('Copy the ETL examples_arduino')
+print('Copy the ETL Arduino examples')
 print('  From :', source)
 print('  To   :', destination)
 shutil.copytree(source, destination, dirs_exist_ok = True)
diff --git a/arduino/examples/Example_0_import_etl/Example_0_import_etl.ino b/arduino/examples/Example_0_import_etl/Example_0_import_etl.ino
new file mode 100644
index 00000000..24fa24a4
--- /dev/null
+++ b/arduino/examples/Example_0_import_etl/Example_0_import_etl.ino
@@ -0,0 +1,12 @@
+#include "Embedded_Template_Library.h"  // This is required for any more etl import when using Arduino IDE
+
+void setup()
+{
+  
+}
+
+
+void loop()
+{
+  
+}
diff --git a/arduino_examples/Vector_Examples/Example_Vector_1_simple_use/Example_Vector_1_simple_use.ino b/arduino/examples/Vector_Examples/Example_Vector_1_simple_use/Example_Vector_1_simple_use.ino
similarity index 86%
rename from arduino_examples/Vector_Examples/Example_Vector_1_simple_use/Example_Vector_1_simple_use.ino
rename to arduino/examples/Vector_Examples/Example_Vector_1_simple_use/Example_Vector_1_simple_use.ino
index a0c92fc1..a707ce89 100644
--- a/arduino_examples/Vector_Examples/Example_Vector_1_simple_use/Example_Vector_1_simple_use.ino
+++ b/arduino/examples/Vector_Examples/Example_Vector_1_simple_use/Example_Vector_1_simple_use.ino
@@ -2,17 +2,22 @@
 #include "etl/vector.h"
 
 template <typename T>
-void print_vector(etl::ivector<T> const & vec_in){
+void print_vector(etl::ivector<T> const & vec_in)
+{
   Serial.print(F("print vector content | size ")); Serial.print(vec_in.size()); Serial.print(F(" | capacity ")); Serial.println(vec_in.capacity());
   Serial.print(F("content | "));
-  for (T const & elem : vec_in) {
+
+  for (T const & elem : vec_in) 
+  {
     Serial.print(elem);
     Serial.print(F(" | "));
   }
+
   Serial.println();
 }
 
-void setup(){
+void setup()
+{
   Serial.begin(115200);
   delay(100);
   Serial.println(F("booted"));
@@ -32,6 +37,7 @@ void setup(){
   print_vector(vec_int);
 }
 
-void loop(){
+void loop()
+{
   
 }
diff --git a/arduino_examples/Example_0_import_etl/Example_0_import_etl.ino b/arduino_examples/Example_0_import_etl/Example_0_import_etl.ino
deleted file mode 100644
index d208c463..00000000
--- a/arduino_examples/Example_0_import_etl/Example_0_import_etl.ino
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "Embedded_Template_Library.h"  // this is required for any more etl import when using Arduino IDE
-
-void setup(){
-  
-}
-
-
-void loop(){
-  
-}
diff --git a/test/vs2019/etl.vcxproj b/test/vs2019/etl.vcxproj
index 102055ea..6c70ddf5 100644
--- a/test/vs2019/etl.vcxproj
+++ b/test/vs2019/etl.vcxproj
@@ -4982,6 +4982,8 @@
     <None Include="..\..\.github\workflows\vs2019.yml" />
     <None Include="..\..\appveyor.yml" />
     <None Include="..\..\arduino\create_arduino_library.py" />
+    <None Include="..\..\arduino\examples\Example_0_import_etl\Example_0_import_etl.ino" />
+    <None Include="..\..\arduino\examples\Vector_Examples\Example_Vector_1_simple_use\Example_Vector_1_simple_use.ino" />
     <None Include="..\..\conanfile.py" />
     <None Include="..\..\etl.pspimage" />
     <None Include="..\..\etl.xar" />
diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters
index 46c2f34d..cd5ef18a 100644
--- a/test/vs2019/etl.vcxproj.filters
+++ b/test/vs2019/etl.vcxproj.filters
@@ -106,6 +106,18 @@
     <Filter Include="Source Files\Scripts">
       <UniqueIdentifier>{562466b5-677d-4448-9e9e-f70805cd71ad}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ETL\Arduino\Examples">
+      <UniqueIdentifier>{1d6ea286-57ad-4960-9343-9d2376087b24}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ETL\Arduino\Examples\Example_0_import_etl">
+      <UniqueIdentifier>{5eace791-3e53-4205-a04d-2aba3bac6b47}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ETL\Arduino\Examples\Vector_Examples">
+      <UniqueIdentifier>{2b770849-325e-4ec5-a7f3-9a192cd40dca}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ETL\Arduino\Examples\Vector_Examples\Example_Vector_1_simple_use">
+      <UniqueIdentifier>{0e4d2126-b9b7-4eef-b5ca-18363b1e01ce}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\etl\enum_type.h">
@@ -2614,6 +2626,12 @@
     <None Include="..\runtests.sh">
       <Filter>Source Files\Scripts</Filter>
     </None>
+    <None Include="..\..\arduino\examples\Example_0_import_etl\Example_0_import_etl.ino">
+      <Filter>ETL\Arduino\Examples\Example_0_import_etl</Filter>
+    </None>
+    <None Include="..\..\arduino\examples\Vector_Examples\Example_Vector_1_simple_use\Example_Vector_1_simple_use.ino">
+      <Filter>ETL\Arduino\Examples\Vector_Examples\Example_Vector_1_simple_use</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\support\Release notes.txt">