diff --git a/Stylet/BootstrapperBase.cs b/Stylet/BootstrapperBase.cs
index a52767e..190b2a7 100644
--- a/Stylet/BootstrapperBase.cs
+++ b/Stylet/BootstrapperBase.cs
@@ -39,7 +39,7 @@ namespace Stylet
 
         public BootstrapperBase()
         {
-            var rc = new ResourceDictionary() { Source = new Uri("pack://application:,,,/Stylet;component/StyletResourceDictionary.xaml", UriKind.Absolute) };
+            var rc = new ResourceDictionary() { Source = new Uri("pack://application:,,,/Stylet;component/Xaml/StyletResourceDictionary.xaml", UriKind.Absolute) };
             this.MergedDictionaries.Add(rc);
 
             this.Start();
diff --git a/Stylet/Stylet.csproj b/Stylet/Stylet.csproj
index b0cb556..690a8cf 100644
--- a/Stylet/Stylet.csproj
+++ b/Stylet/Stylet.csproj
@@ -43,17 +43,17 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ActionExtension.cs" />
+    <Compile Include="Xaml\ActionExtension.cs" />
     <Compile Include="AssemblySource.cs" />
     <Compile Include="BindableCollection.cs" />
     <Compile Include="BootstrapperBase.cs" />
-    <Compile Include="CommandAction.cs" />
+    <Compile Include="Xaml\CommandAction.cs" />
     <Compile Include="Conductor.cs" />
     <Compile Include="ConductorAllActive.cs" />
     <Compile Include="ConductorBase.cs" />
     <Compile Include="ConductorBaseWithActiveItem.cs" />
     <Compile Include="ConductorOneActive.cs" />
-    <Compile Include="EventAction.cs" />
+    <Compile Include="Xaml\EventAction.cs" />
     <Compile Include="EventAggregator.cs" />
     <Compile Include="Execute.cs" />
     <Compile Include="ExpressionExtensions.cs" />
@@ -78,7 +78,7 @@
     <Compile Include="WindowManager.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="StyletResourceDictionary.xaml">
+    <Page Include="Xaml\StyletResourceDictionary.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
diff --git a/Stylet/ActionExtension.cs b/Stylet/Xaml/ActionExtension.cs
similarity index 100%
rename from Stylet/ActionExtension.cs
rename to Stylet/Xaml/ActionExtension.cs
diff --git a/Stylet/CommandAction.cs b/Stylet/Xaml/CommandAction.cs
similarity index 100%
rename from Stylet/CommandAction.cs
rename to Stylet/Xaml/CommandAction.cs
diff --git a/Stylet/EventAction.cs b/Stylet/Xaml/EventAction.cs
similarity index 100%
rename from Stylet/EventAction.cs
rename to Stylet/Xaml/EventAction.cs
diff --git a/Stylet/StyletResourceDictionary.xaml b/Stylet/Xaml/StyletResourceDictionary.xaml
similarity index 100%
rename from Stylet/StyletResourceDictionary.xaml
rename to Stylet/Xaml/StyletResourceDictionary.xaml
diff --git a/StyletUnitTests/ConductorAllActiveTests.cs b/StyletUnitTests/ConductorAllActiveTests.cs
index 0b2c032..abce2d0 100644
--- a/StyletUnitTests/ConductorAllActiveTests.cs
+++ b/StyletUnitTests/ConductorAllActiveTests.cs
@@ -131,7 +131,7 @@ namespace StyletUnitTests
             this.conductor.ActivateItem(screen.Object);
             this.conductor.DeactivateItem(screen.Object, false);
             screen.Verify(x => x.Deactivate(false));
-            Assert.That(this.conductor.Items, Is.EquivalentTo(new[] { screen.Object }))
+            Assert.That(this.conductor.Items, Is.EquivalentTo(new[] { screen.Object }));
         }
 
         [Test]