diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..942b111a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.sdf
+*.user
+*.suo
+Debug
+ipch
+*.opensdf
diff --git a/JsonGeneratorTests/JsonGeneratorTests.sln b/ArduinoJson.sln
similarity index 56%
rename from JsonGeneratorTests/JsonGeneratorTests.sln
rename to ArduinoJson.sln
index 3104cc9c..e72fa857 100644
--- a/JsonGeneratorTests/JsonGeneratorTests.sln
+++ b/ArduinoJson.sln
@@ -1,9 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JsonGeneratorTests", "JsonGeneratorTests.vcxproj", "{B9545D97-E084-4A19-8E48-929157064360}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JsonGeneratorTests", "JsonGeneratorTests\JsonGeneratorTests.vcxproj", "{B9545D97-E084-4A19-8E48-929157064360}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JsonParserTests", "JsonParserTests\JsonParserTests.vcxproj", "{4DD596EF-0185-4AB4-A3C2-F20C496F7806}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,6 +17,10 @@ Global
 		{B9545D97-E084-4A19-8E48-929157064360}.Debug|Win32.Build.0 = Debug|Win32
 		{B9545D97-E084-4A19-8E48-929157064360}.Release|Win32.ActiveCfg = Release|Win32
 		{B9545D97-E084-4A19-8E48-929157064360}.Release|Win32.Build.0 = Release|Win32
+		{4DD596EF-0185-4AB4-A3C2-F20C496F7806}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4DD596EF-0185-4AB4-A3C2-F20C496F7806}.Debug|Win32.Build.0 = Debug|Win32
+		{4DD596EF-0185-4AB4-A3C2-F20C496F7806}.Release|Win32.ActiveCfg = Release|Win32
+		{4DD596EF-0185-4AB4-A3C2-F20C496F7806}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/JsonGeneratorTests/.gitignore b/JsonGeneratorTests/.gitignore
deleted file mode 100644
index 23550d0d..00000000
--- a/JsonGeneratorTests/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/*.sdf
-/*.user
-/*.suo
-/Debug
-/ipch
-/*.opensdf
diff --git a/JsonParserTests/.gitignore b/JsonParserTests/.gitignore
deleted file mode 100644
index 23550d0d..00000000
--- a/JsonParserTests/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/*.sdf
-/*.user
-/*.suo
-/Debug
-/ipch
-/*.opensdf
diff --git a/JsonParserTests/ArduinoJsonParserTests.sln b/JsonParserTests/ArduinoJsonParserTests.sln
deleted file mode 100644
index f796c4db..00000000
--- a/JsonParserTests/ArduinoJsonParserTests.sln
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArduinoJsonParserTests", "ArduinoJsonParserTests.vcxproj", "{4DD596EF-0185-4AB4-A3C2-F20C496F7806}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4DD596EF-0185-4AB4-A3C2-F20C496F7806}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4DD596EF-0185-4AB4-A3C2-F20C496F7806}.Debug|Win32.Build.0 = Debug|Win32
-		{4DD596EF-0185-4AB4-A3C2-F20C496F7806}.Release|Win32.ActiveCfg = Release|Win32
-		{4DD596EF-0185-4AB4-A3C2-F20C496F7806}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/JsonParserTests/ArduinoJsonParserTests.vcxproj b/JsonParserTests/JsonParserTests.vcxproj
similarity index 97%
rename from JsonParserTests/ArduinoJsonParserTests.vcxproj
rename to JsonParserTests/JsonParserTests.vcxproj
index db741777..857e4ae9 100644
--- a/JsonParserTests/ArduinoJsonParserTests.vcxproj
+++ b/JsonParserTests/JsonParserTests.vcxproj
@@ -14,6 +14,7 @@
     <ProjectGuid>{4DD596EF-0185-4AB4-A3C2-F20C496F7806}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>ArduinoJsonParserTests</RootNamespace>
+    <ProjectName>JsonParserTests</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/JsonParserTests/ArduinoJsonParserTests.vcxproj.filters b/JsonParserTests/JsonParserTests.vcxproj.filters
similarity index 100%
rename from JsonParserTests/ArduinoJsonParserTests.vcxproj.filters
rename to JsonParserTests/JsonParserTests.vcxproj.filters