diff --git a/ConsoleBuffer.sln b/ConsoleBuffer.sln
index 39c61ed..792f487 100644
--- a/ConsoleBuffer.sln
+++ b/ConsoleBuffer.sln
@@ -5,9 +5,9 @@ VisualStudioVersion = 15.0.28010.2036
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleBuffer", "src\ConsoleBuffer\ConsoleBuffer.csproj", "{A16D11B0-4785-434F-8514-ABCC16DDFBFD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "condo.wpf", "src\condo.wpf\condo.wpf.csproj", "{D890EB09-11B9-41A8-B9A7-C1D159312A32}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "condo", "src\condo.wpf\condo.csproj", "{D890EB09-11B9-41A8-B9A7-C1D159312A32}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "condo", "src\condo\condo.csproj", "{FB9FD3E5-EDF1-4924-8945-42DC0AFE478F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "condo.uwp", "src\condo\condo.uwp.csproj", "{FB9FD3E5-EDF1-4924-8945-42DC0AFE478F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -29,8 +29,8 @@ Global
 		{A16D11B0-4785-434F-8514-ABCC16DDFBFD}.Debug|x64.Build.0 = Debug|Any CPU
 		{A16D11B0-4785-434F-8514-ABCC16DDFBFD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{A16D11B0-4785-434F-8514-ABCC16DDFBFD}.Debug|x86.Build.0 = Debug|Any CPU
-		{A16D11B0-4785-434F-8514-ABCC16DDFBFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A16D11B0-4785-434F-8514-ABCC16DDFBFD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A16D11B0-4785-434F-8514-ABCC16DDFBFD}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{A16D11B0-4785-434F-8514-ABCC16DDFBFD}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{A16D11B0-4785-434F-8514-ABCC16DDFBFD}.Release|ARM.ActiveCfg = Release|Any CPU
 		{A16D11B0-4785-434F-8514-ABCC16DDFBFD}.Release|ARM.Build.0 = Release|Any CPU
 		{A16D11B0-4785-434F-8514-ABCC16DDFBFD}.Release|x64.ActiveCfg = Release|Any CPU
@@ -45,8 +45,8 @@ Global
 		{D890EB09-11B9-41A8-B9A7-C1D159312A32}.Debug|x64.Build.0 = Debug|Any CPU
 		{D890EB09-11B9-41A8-B9A7-C1D159312A32}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D890EB09-11B9-41A8-B9A7-C1D159312A32}.Debug|x86.Build.0 = Debug|Any CPU
-		{D890EB09-11B9-41A8-B9A7-C1D159312A32}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D890EB09-11B9-41A8-B9A7-C1D159312A32}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D890EB09-11B9-41A8-B9A7-C1D159312A32}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{D890EB09-11B9-41A8-B9A7-C1D159312A32}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{D890EB09-11B9-41A8-B9A7-C1D159312A32}.Release|ARM.ActiveCfg = Release|Any CPU
 		{D890EB09-11B9-41A8-B9A7-C1D159312A32}.Release|ARM.Build.0 = Release|Any CPU
 		{D890EB09-11B9-41A8-B9A7-C1D159312A32}.Release|x64.ActiveCfg = Release|Any CPU
@@ -54,7 +54,6 @@ Global
 		{D890EB09-11B9-41A8-B9A7-C1D159312A32}.Release|x86.ActiveCfg = Release|Any CPU
 		{D890EB09-11B9-41A8-B9A7-C1D159312A32}.Release|x86.Build.0 = Release|Any CPU
 		{FB9FD3E5-EDF1-4924-8945-42DC0AFE478F}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{FB9FD3E5-EDF1-4924-8945-42DC0AFE478F}.Debug|Any CPU.Build.0 = Debug|x86
 		{FB9FD3E5-EDF1-4924-8945-42DC0AFE478F}.Debug|ARM.ActiveCfg = Debug|ARM
 		{FB9FD3E5-EDF1-4924-8945-42DC0AFE478F}.Debug|ARM.Build.0 = Debug|ARM
 		{FB9FD3E5-EDF1-4924-8945-42DC0AFE478F}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -64,7 +63,7 @@ Global
 		{FB9FD3E5-EDF1-4924-8945-42DC0AFE478F}.Debug|x86.ActiveCfg = Debug|x86
 		{FB9FD3E5-EDF1-4924-8945-42DC0AFE478F}.Debug|x86.Build.0 = Debug|x86
 		{FB9FD3E5-EDF1-4924-8945-42DC0AFE478F}.Debug|x86.Deploy.0 = Debug|x86
-		{FB9FD3E5-EDF1-4924-8945-42DC0AFE478F}.Release|Any CPU.ActiveCfg = Release|x86
+		{FB9FD3E5-EDF1-4924-8945-42DC0AFE478F}.Release|Any CPU.ActiveCfg = Debug|x86
 		{FB9FD3E5-EDF1-4924-8945-42DC0AFE478F}.Release|ARM.ActiveCfg = Release|ARM
 		{FB9FD3E5-EDF1-4924-8945-42DC0AFE478F}.Release|ARM.Build.0 = Release|ARM
 		{FB9FD3E5-EDF1-4924-8945-42DC0AFE478F}.Release|ARM.Deploy.0 = Release|ARM
diff --git a/src/condo.wpf/condo.wpf.csproj b/src/condo.wpf/condo.csproj
similarity index 100%
rename from src/condo.wpf/condo.wpf.csproj
rename to src/condo.wpf/condo.csproj
diff --git a/src/condo/condo.csproj b/src/condo/condo.uwp.csproj
similarity index 100%
rename from src/condo/condo.csproj
rename to src/condo/condo.uwp.csproj