diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..0c3dcb5
Binary files /dev/null and b/.DS_Store differ
diff --git a/Xunit.Categories.sln b/Xunit.Categories.sln
index 1c8ad9e..79b02d9 100644
--- a/Xunit.Categories.sln
+++ b/Xunit.Categories.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.0.0
 MinimumVisualStudioVersion = 10.0.0.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xunit.Categories", "Xunit.Categories.csproj", "{690B1C92-FB11-4DED-958B-F3AC80C0B8BC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xunit.Categories", "src\Xunit.Categories.csproj", "{690B1C92-FB11-4DED-958B-F3AC80C0B8BC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xunit.Categories.Tests", "Xunit.Categories.Tests\Xunit.Categories.Tests.csproj", "{FA305F57-621F-4A48-8D18-CAD2BF752577}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xunit.Categories.Tests", "src\Xunit.Categories.Tests\Xunit.Categories.Tests.csproj", "{FA305F57-621F-4A48-8D18-CAD2BF752577}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/.DS_Store b/src/.DS_Store
new file mode 100644
index 0000000..4a74243
Binary files /dev/null and b/src/.DS_Store differ
diff --git a/BugAttribute.cs b/src/BugAttribute.cs
similarity index 100%
rename from BugAttribute.cs
rename to src/BugAttribute.cs
diff --git a/BugDiscoverer.cs b/src/BugDiscoverer.cs
similarity index 100%
rename from BugDiscoverer.cs
rename to src/BugDiscoverer.cs
diff --git a/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
similarity index 93%
rename from Properties/AssemblyInfo.cs
rename to src/Properties/AssemblyInfo.cs
index 870bac1..c08fbb5 100644
--- a/Properties/AssemblyInfo.cs
+++ b/src/Properties/AssemblyInfo.cs
@@ -6,7 +6,7 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly: AssemblyTitle("Xunit.Categories")]
+[assembly: AssemblyTitle("unit.Categories")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
diff --git a/Xunit.Categories.Tests/Properties/AssemblyInfo.cs b/src/Xunit.Categories.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xunit.Categories.Tests/Properties/AssemblyInfo.cs
rename to src/Xunit.Categories.Tests/Properties/AssemblyInfo.cs
diff --git a/Xunit.Categories.Tests/Scratch.cs b/src/Xunit.Categories.Tests/Scratch.cs
similarity index 100%
rename from Xunit.Categories.Tests/Scratch.cs
rename to src/Xunit.Categories.Tests/Scratch.cs
diff --git a/Xunit.Categories.Tests/Xunit.Categories.Tests.csproj b/src/Xunit.Categories.Tests/Xunit.Categories.Tests.csproj
similarity index 100%
rename from Xunit.Categories.Tests/Xunit.Categories.Tests.csproj
rename to src/Xunit.Categories.Tests/Xunit.Categories.Tests.csproj
diff --git a/Xunit.Categories.Tests/packages.config b/src/Xunit.Categories.Tests/packages.config
similarity index 100%
rename from Xunit.Categories.Tests/packages.config
rename to src/Xunit.Categories.Tests/packages.config
diff --git a/Xunit.Categories.csproj b/src/Xunit.Categories.csproj
similarity index 100%
rename from Xunit.Categories.csproj
rename to src/Xunit.Categories.csproj
diff --git a/packages.config b/src/packages.config
similarity index 100%
rename from packages.config
rename to src/packages.config