diff --git a/srcs/Print.cpp b/srcs/Arduino/Print.cpp
similarity index 100%
rename from srcs/Print.cpp
rename to srcs/Arduino/Print.cpp
diff --git a/srcs/Print.h b/srcs/Arduino/Print.h
similarity index 100%
rename from srcs/Print.h
rename to srcs/Arduino/Print.h
diff --git a/srcs/Printable.h b/srcs/Arduino/Printable.h
similarity index 100%
rename from srcs/Printable.h
rename to srcs/Arduino/Printable.h
diff --git a/srcs/EscapedString.cpp b/srcs/Internals/EscapedString.cpp
similarity index 100%
rename from srcs/EscapedString.cpp
rename to srcs/Internals/EscapedString.cpp
diff --git a/srcs/EscapedString.h b/srcs/Internals/EscapedString.h
similarity index 85%
rename from srcs/EscapedString.h
rename to srcs/Internals/EscapedString.h
index 22db62c7..ab9ec4d9 100644
--- a/srcs/EscapedString.h
+++ b/srcs/Internals/EscapedString.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "Print.h"
+#include "../Arduino/Print.h"
 
 namespace ArduinoJson
 {
diff --git a/srcs/JsonNode.h b/srcs/Internals/JsonNode.h
similarity index 100%
rename from srcs/JsonNode.h
rename to srcs/Internals/JsonNode.h
diff --git a/srcs/JsonNodeSerializer.cpp b/srcs/Internals/JsonNodeSerializer.cpp
similarity index 100%
rename from srcs/JsonNodeSerializer.cpp
rename to srcs/Internals/JsonNodeSerializer.cpp
diff --git a/srcs/JsonNodeSerializer.h b/srcs/Internals/JsonNodeSerializer.h
similarity index 100%
rename from srcs/JsonNodeSerializer.h
rename to srcs/Internals/JsonNodeSerializer.h
diff --git a/srcs/StringBuilder.cpp b/srcs/Internals/StringBuilder.cpp
similarity index 100%
rename from srcs/StringBuilder.cpp
rename to srcs/Internals/StringBuilder.cpp
diff --git a/srcs/StringBuilder.h b/srcs/Internals/StringBuilder.h
similarity index 89%
rename from srcs/StringBuilder.h
rename to srcs/Internals/StringBuilder.h
index 3e0bc96f..47a23337 100644
--- a/srcs/StringBuilder.h
+++ b/srcs/Internals/StringBuilder.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "Print.h"
+#include "../Arduino/Print.h"
 
 namespace ArduinoJson
 {
diff --git a/srcs/JsonBuffer.cpp b/srcs/JsonBuffer.cpp
index f90e5f07..66832825 100644
--- a/srcs/JsonBuffer.cpp
+++ b/srcs/JsonBuffer.cpp
@@ -2,9 +2,9 @@
 
 #include <string.h> // for memset
 
-#include "JsonNode.h"
 #include "JsonObject.h"
 #include "JsonValue.h"
+#include "Internals/JsonNode.h"
 
 JsonObject JsonBuffer::createObject()
 {
diff --git a/srcs/JsonBuffer.h b/srcs/JsonBuffer.h
index ce4399ff..893ed739 100644
--- a/srcs/JsonBuffer.h
+++ b/srcs/JsonBuffer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <stddef.h>
-#include "JsonNode.h"
+#include "Internals/JsonNode.h"
+
 
 class JsonObject;
 class JsonValue;
diff --git a/srcs/JsonObject.cpp b/srcs/JsonObject.cpp
index f9caa347..716ac22b 100644
--- a/srcs/JsonObject.cpp
+++ b/srcs/JsonObject.cpp
@@ -2,12 +2,12 @@
 
 #include <string.h> // for strcmp
 
-#include "EscapedString.h"
 #include "JsonBuffer.h"
 #include "JsonValue.h"
-#include "JsonNode.h"
-#include "StringBuilder.h"
-#include "JsonNodeSerializer.h"
+#include "Internals/EscapedString.h"
+#include "Internals/JsonNode.h"
+#include "Internals/JsonNodeSerializer.h"
+#include "Internals/StringBuilder.h"
 
 using namespace ArduinoJson::Internals;
 
diff --git a/srcs/JsonObject.h b/srcs/JsonObject.h
index ccd3b866..313b911c 100644
--- a/srcs/JsonObject.h
+++ b/srcs/JsonObject.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Printable.h"
+#include "Arduino/Printable.h"
 
 class JsonValue;
 struct JsonNode;
diff --git a/srcs/JsonValue.cpp b/srcs/JsonValue.cpp
index 10bad2f8..9da885bb 100644
--- a/srcs/JsonValue.cpp
+++ b/srcs/JsonValue.cpp
@@ -1,6 +1,7 @@
 #include "JsonObject.h"
-#include "JsonNode.h"
+
 #include "JsonValue.h"
+#include "Internals/JsonNode.h"
 
 void JsonValue::operator=(bool value)
 {
diff --git a/srcs/srcs.vcxproj b/srcs/srcs.vcxproj
index 9e4cf523..af7a4b0a 100644
--- a/srcs/srcs.vcxproj
+++ b/srcs/srcs.vcxproj
@@ -39,7 +39,14 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)\bin\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)\obj\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(ProjectDir)\bin\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)\obj\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -67,25 +74,25 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="EscapedString.h" />
+    <ClInclude Include="Internals\EscapedString.h" />
     <ClInclude Include="JsonBuffer.h" />
-    <ClInclude Include="JsonNode.h" />
-    <ClInclude Include="JsonNodeSerializer.h" />
+    <ClInclude Include="Internals\JsonNode.h" />
+    <ClInclude Include="Internals\JsonNodeSerializer.h" />
     <ClInclude Include="JsonObject.h" />
     <ClInclude Include="JsonValue.h" />
-    <ClInclude Include="Print.h" />
-    <ClInclude Include="Printable.h" />
+    <ClInclude Include="Arduino\Print.h" />
+    <ClInclude Include="Arduino\Printable.h" />
     <ClInclude Include="StaticJsonBuffer.h" />
-    <ClInclude Include="StringBuilder.h" />
+    <ClInclude Include="Internals\StringBuilder.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="EscapedString.cpp" />
+    <ClCompile Include="Internals\EscapedString.cpp" />
     <ClCompile Include="JsonBuffer.cpp" />
-    <ClCompile Include="JsonNodeSerializer.cpp" />
+    <ClCompile Include="Internals\JsonNodeSerializer.cpp" />
     <ClCompile Include="JsonObject.cpp" />
     <ClCompile Include="JsonValue.cpp" />
-    <ClCompile Include="Print.cpp" />
-    <ClCompile Include="StringBuilder.cpp" />
+    <ClCompile Include="Arduino\Print.cpp" />
+    <ClCompile Include="Internals\StringBuilder.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/srcs/srcs.vcxproj.filters b/srcs/srcs.vcxproj.filters
index 8b80182e..e83bb14d 100644
--- a/srcs/srcs.vcxproj.filters
+++ b/srcs/srcs.vcxproj.filters
@@ -27,22 +27,22 @@
     <ClInclude Include="JsonBuffer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="JsonNode.h">
+    <ClInclude Include="Internals\EscapedString.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="StringBuilder.h">
+    <ClInclude Include="Internals\JsonNode.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Print.h">
+    <ClInclude Include="Internals\JsonNodeSerializer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Printable.h">
+    <ClInclude Include="Internals\StringBuilder.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="EscapedString.h">
+    <ClInclude Include="Arduino\Print.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="JsonNodeSerializer.h">
+    <ClInclude Include="Arduino\Printable.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -56,16 +56,16 @@
     <ClCompile Include="JsonValue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="StringBuilder.cpp">
+    <ClCompile Include="Internals\EscapedString.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Print.cpp">
+    <ClCompile Include="Internals\JsonNodeSerializer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="EscapedString.cpp">
+    <ClCompile Include="Internals\StringBuilder.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="JsonNodeSerializer.cpp">
+    <ClCompile Include="Arduino\Print.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/tests/EscapedStringTests.cpp b/tests/EscapedStringTests.cpp
index fb662574..00805335 100644
--- a/tests/EscapedStringTests.cpp
+++ b/tests/EscapedStringTests.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 
-#include "EscapedString.h"
-#include "StringBuilder.h"
+#include <Internals/EscapedString.h>
+#include <Internals/StringBuilder.h>
 
 using namespace ArduinoJson::Internals;
 
diff --git a/tests/StringBuilderTests.cpp b/tests/StringBuilderTests.cpp
index 847c972f..cea27b4a 100644
--- a/tests/StringBuilderTests.cpp
+++ b/tests/StringBuilderTests.cpp
@@ -1,6 +1,5 @@
 #include <gtest/gtest.h>
-
-#include "StringBuilder.h"
+#include <Internals/StringBuilder.h>
 
 using namespace ArduinoJson::Internals;