diff --git a/JsonGeneratorTests/JsonArray.h b/JsonGenerator/JsonArray.h
similarity index 100%
rename from JsonGeneratorTests/JsonArray.h
rename to JsonGenerator/JsonArray.h
diff --git a/JsonGeneratorTests/JsonHashTable.h b/JsonGenerator/JsonHashTable.h
similarity index 100%
rename from JsonGeneratorTests/JsonHashTable.h
rename to JsonGenerator/JsonHashTable.h
diff --git a/JsonGeneratorTests/JsonObjectBase.h b/JsonGenerator/JsonObjectBase.h
similarity index 100%
rename from JsonGeneratorTests/JsonObjectBase.h
rename to JsonGenerator/JsonObjectBase.h
diff --git a/JsonGeneratorTests/JsonValue.cpp b/JsonGenerator/JsonValue.cpp
similarity index 100%
rename from JsonGeneratorTests/JsonValue.cpp
rename to JsonGenerator/JsonValue.cpp
diff --git a/JsonGeneratorTests/JsonValue.h b/JsonGenerator/JsonValue.h
similarity index 100%
rename from JsonGeneratorTests/JsonValue.h
rename to JsonGenerator/JsonValue.h
diff --git a/JsonGeneratorTests/Print.h b/JsonGenerator/Print.h
similarity index 100%
rename from JsonGeneratorTests/Print.h
rename to JsonGenerator/Print.h
diff --git a/JsonGeneratorTests/Printable.h b/JsonGenerator/Printable.h
similarity index 100%
rename from JsonGeneratorTests/Printable.h
rename to JsonGenerator/Printable.h
diff --git a/JsonGeneratorTests/StringBuilder.cpp b/JsonGenerator/StringBuilder.cpp
similarity index 100%
rename from JsonGeneratorTests/StringBuilder.cpp
rename to JsonGenerator/StringBuilder.cpp
diff --git a/JsonGeneratorTests/StringBuilder.h b/JsonGenerator/StringBuilder.h
similarity index 100%
rename from JsonGeneratorTests/StringBuilder.h
rename to JsonGenerator/StringBuilder.h
diff --git a/JsonGeneratorTests/JsonGeneratorTests.vcxproj b/JsonGeneratorTests/JsonGeneratorTests.vcxproj
index 67807102..1ecfdbdc 100644
--- a/JsonGeneratorTests/JsonGeneratorTests.vcxproj
+++ b/JsonGeneratorTests/JsonGeneratorTests.vcxproj
@@ -43,9 +43,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(ProjectDir)/../JsonGenerator;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(ProjectDir)/../JsonGenerator;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -82,20 +84,20 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\JsonGenerator\JsonValue.cpp" />
+    <ClCompile Include="..\JsonGenerator\StringBuilder.cpp" />
     <ClCompile Include="JsonArrayTests.cpp" />
     <ClCompile Include="JsonHashTableTests.cpp" />
-    <ClCompile Include="JsonValue.cpp" />
-    <ClCompile Include="StringBuilder.cpp" />
     <ClCompile Include="JsonValueTests.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="JsonArray.h" />
-    <ClInclude Include="JsonHashTable.h" />
-    <ClInclude Include="JsonObjectBase.h" />
-    <ClInclude Include="Print.h" />
-    <ClInclude Include="JsonValue.h" />
-    <ClInclude Include="Printable.h" />
-    <ClInclude Include="StringBuilder.h" />
+    <ClInclude Include="..\JsonGenerator\JsonArray.h" />
+    <ClInclude Include="..\JsonGenerator\JsonHashTable.h" />
+    <ClInclude Include="..\JsonGenerator\JsonObjectBase.h" />
+    <ClInclude Include="..\JsonGenerator\JsonValue.h" />
+    <ClInclude Include="..\JsonGenerator\Print.h" />
+    <ClInclude Include="..\JsonGenerator\Printable.h" />
+    <ClInclude Include="..\JsonGenerator\StringBuilder.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/JsonGeneratorTests/JsonGeneratorTests.vcxproj.filters b/JsonGeneratorTests/JsonGeneratorTests.vcxproj.filters
index 0ac6b8d9..5de1cd7b 100644
--- a/JsonGeneratorTests/JsonGeneratorTests.vcxproj.filters
+++ b/JsonGeneratorTests/JsonGeneratorTests.vcxproj.filters
@@ -18,39 +18,39 @@
     <ClCompile Include="JsonArrayTests.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="StringBuilder.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="JsonHashTableTests.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="JsonValue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="JsonValueTests.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\JsonGenerator\JsonValue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\JsonGenerator\StringBuilder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="StringBuilder.h">
+    <ClInclude Include="..\JsonGenerator\JsonArray.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="JsonObjectBase.h">
+    <ClInclude Include="..\JsonGenerator\JsonHashTable.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="JsonHashTable.h">
+    <ClInclude Include="..\JsonGenerator\JsonObjectBase.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="JsonValue.h">
+    <ClInclude Include="..\JsonGenerator\JsonValue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="JsonArray.h">
+    <ClInclude Include="..\JsonGenerator\Print.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Print.h">
+    <ClInclude Include="..\JsonGenerator\Printable.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Printable.h">
+    <ClInclude Include="..\JsonGenerator\StringBuilder.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>