diff --git a/csharpcore/GildedRose.sln b/csharpcore/GildedRose.sln
new file mode 100644
index 00000000..a922b9a1
--- /dev/null
+++ b/csharpcore/GildedRose.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31424.327
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GildedRose", "GildedRose\GildedRose.csproj", "{D781C52B-92C0-48BF-8414-177495DF4174}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GildedRoseTests", "GildedRoseTests\GildedRoseTests.csproj", "{CB6715CE-A283-4C70-9C1B-F58822077731}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D781C52B-92C0-48BF-8414-177495DF4174}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D781C52B-92C0-48BF-8414-177495DF4174}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D781C52B-92C0-48BF-8414-177495DF4174}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D781C52B-92C0-48BF-8414-177495DF4174}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB6715CE-A283-4C70-9C1B-F58822077731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB6715CE-A283-4C70-9C1B-F58822077731}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB6715CE-A283-4C70-9C1B-F58822077731}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB6715CE-A283-4C70-9C1B-F58822077731}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {02785EA4-86A5-4E57-9A9A-6998FAE1E617}
+	EndGlobalSection
+EndGlobal
diff --git a/csharpcore/GildedRose.cs b/csharpcore/GildedRose/GildedRose.cs
similarity index 99%
rename from csharpcore/GildedRose.cs
rename to csharpcore/GildedRose/GildedRose.cs
index 0d019901..ed7dc428 100644
--- a/csharpcore/GildedRose.cs
+++ b/csharpcore/GildedRose/GildedRose.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace csharpcore
+namespace GildedRoseKata
 {
     public class GildedRose
     {
diff --git a/csharpcore/GildedRose/GildedRose.csproj b/csharpcore/GildedRose/GildedRose.csproj
new file mode 100644
index 00000000..89266e99
--- /dev/null
+++ b/csharpcore/GildedRose/GildedRose.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <StartupObject>GildedRoseKata.Program</StartupObject>
+  </PropertyGroup>
+
+</Project>
diff --git a/csharpcore/Item.cs b/csharpcore/GildedRose/Item.cs
similarity index 85%
rename from csharpcore/Item.cs
rename to csharpcore/GildedRose/Item.cs
index 7940eb84..3d87cab4 100644
--- a/csharpcore/Item.cs
+++ b/csharpcore/GildedRose/Item.cs
@@ -1,4 +1,4 @@
-namespace csharpcore
+namespace GildedRoseKata
 {
     public class Item
     {
diff --git a/csharpcore/Program.cs b/csharpcore/GildedRose/Program.cs
similarity index 98%
rename from csharpcore/Program.cs
rename to csharpcore/GildedRose/Program.cs
index ebe4da4a..1367fe73 100644
--- a/csharpcore/Program.cs
+++ b/csharpcore/GildedRose/Program.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace csharpcore
+namespace GildedRoseKata
 {
     public class Program
     {
diff --git a/csharpcore/ApprovalTest.cs b/csharpcore/GildedRoseTests/ApprovalTest.cs
similarity index 92%
rename from csharpcore/ApprovalTest.cs
rename to csharpcore/GildedRoseTests/ApprovalTest.cs
index 7b5d2db4..178e66a7 100644
--- a/csharpcore/ApprovalTest.cs
+++ b/csharpcore/GildedRoseTests/ApprovalTest.cs
@@ -4,8 +4,9 @@ using System.IO;
 using System.Text;
 using ApprovalTests;
 using ApprovalTests.Reporters;
+using GildedRoseKata;
 
-namespace csharpcore
+namespace GildedRoseTests
 {
     [UseReporter(typeof(DiffReporter))]
     public class ApprovalTest
diff --git a/csharpcore/GildedRoseTest.cs b/csharpcore/GildedRoseTests/GildedRoseTest.cs
similarity index 85%
rename from csharpcore/GildedRoseTest.cs
rename to csharpcore/GildedRoseTests/GildedRoseTest.cs
index aa64b0b5..6e5d24b6 100644
--- a/csharpcore/GildedRoseTest.cs
+++ b/csharpcore/GildedRoseTests/GildedRoseTest.cs
@@ -1,17 +1,18 @@
-using Xunit;
-using System.Collections.Generic;
-
-namespace csharpcore
-{
-    public class GildedRoseTest
-    {
-        [Fact]
-        public void foo()
-        {
-            IList<Item> Items = new List<Item> { new Item { Name = "foo", SellIn = 0, Quality = 0 } };
-            GildedRose app = new GildedRose(Items);
-            app.UpdateQuality();
-            Assert.Equal("fixme", Items[0].Name);
-        }
-    }
-}
\ No newline at end of file
+using Xunit;
+using System.Collections.Generic;
+using GildedRoseKata;
+
+namespace GildedRoseTests
+{
+    public class GildedRoseTest
+    {
+        [Fact]
+        public void foo()
+        {
+            IList<Item> Items = new List<Item> { new Item { Name = "foo", SellIn = 0, Quality = 0 } };
+            GildedRose app = new GildedRose(Items);
+            app.UpdateQuality();
+            Assert.Equal("fixme", Items[0].Name);
+        }
+    }
+}
diff --git a/csharpcore/csharpcore.csproj b/csharpcore/GildedRoseTests/GildedRoseTests.csproj
similarity index 66%
rename from csharpcore/csharpcore.csproj
rename to csharpcore/GildedRoseTests/GildedRoseTests.csproj
index 3d6d5eea..3991f8c9 100644
--- a/csharpcore/csharpcore.csproj
+++ b/csharpcore/GildedRoseTests/GildedRoseTests.csproj
@@ -1,15 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <StartupObject>csharpcore.Program</StartupObject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="ApprovalTests" Version="5.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="ApprovalTests" Version="5.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+    <PackageReference Include="coverlet.collector" Version="3.1.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\GildedRose\GildedRose.csproj" />
+  </ItemGroup>
+
+</Project>