diff --git a/src/Orchard.Web/Core/Navigation/Module.txt b/src/Orchard.Web/Core/Navigation/Module.txt
new file mode 100644
index 000000000..6fbcc77fc
--- /dev/null
+++ b/src/Orchard.Web/Core/Navigation/Module.txt
@@ -0,0 +1 @@
+name: Navigation
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index 4d5af6604..d91458e43 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -180,6 +180,7 @@
     <Content Include="Common\Views\EditorTemplates\Parts\Common.Body.ascx" />
     <Content Include="Common\Views\EditorTemplates\Parts\Common.Owner.ascx" />
     <Content Include="Feeds\Module.txt" />
+    <Content Include="Navigation\Module.txt" />
     <Content Include="Scheduling\Module.txt" />
     <Content Include="Settings\Views\EditorTemplates\Items\Settings.Site.ascx" />
     <Content Include="Themes\Scripts\jquery-1.4.1.js" />
@@ -201,6 +202,8 @@
     <Content Include="Themes\Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Navigation\Controllers\" />
+    <Folder Include="Navigation\Models\" />
     <Folder Include="Scheduling\Controllers\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
index f89cc3761..d17ec264b 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
@@ -66,8 +66,6 @@
     <Compile Include="Controllers\SetupController.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Routes.cs" />
-    <Compile Include="Services\ISetupService.cs" />
-    <Compile Include="Services\SetupService.cs" />
     <Compile Include="ViewModels\SetupViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/ISetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/ISetupService.cs
deleted file mode 100644
index 5aa207c5c..000000000
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/ISetupService.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Orchard.Setup.Services {
-    public interface ISetupService : IDependency {
-    }
-}
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
deleted file mode 100644
index 60ee213f4..000000000
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Orchard.Localization;
-using Orchard.Logging;
-
-namespace Orchard.Setup.Services {
-    public class SetupService : ISetupService {
-        public SetupService(IOrchardServices services) {
-            Services = services;
-            Logger = NullLogger.Instance;
-            T = NullLocalizer.Instance;
-        }
-
-        public IOrchardServices Services { get; set; }
-        public ILogger Logger { get; set; }
-        private Localizer T { get; set; }
-    }
-}