Commit 5a2bfe2

@@ -25,25 +25,29 @@ namespace MoMoney.boot.container.registration
             register.singleton<ISynchronizeInvoke>(() => shell);
             register.singleton<IRegionManager>(() => shell);
             register.singleton(() => shell);
-            register_tab<IAboutApplicationView, AboutTheApplicationView>();
-            register_tab<ISplashScreenView, SplashScreenView>();
-            register_tab<IAddCompanyView, AddCompanyView>();
-            register_tab<IViewAllBills, ViewAllBills>();
-            register_tab<IAddBillPaymentView, AddBillPaymentView>();
-            register_tab<IMainMenuView, MainMenuView>();
-            register_tab<IAddNewIncomeView, AddNewIncomeView>();
-            register_tab<IViewIncomeHistory, ViewAllIncome>();
-            register_tab<INotificationIconView, NotificationIconView>();
-            register_tab<IStatusBarView, StatusBarView>();
-            register_tab<IGettingStartedView, WelcomeScreen>();
-            register_tab<ILogFileView, LogFileView>();
+            register_singleton<IAboutApplicationView, AboutTheApplicationView>();
+            register_singleton<ISplashScreenView, SplashScreenView>();
+            register_singleton<IAddCompanyView, AddCompanyView>();
+            register_singleton<IViewAllBills, ViewAllBills>();
+            register_singleton<IAddBillPaymentView, AddBillPaymentView>();
+            register_singleton<IMainMenuView, MainMenuView>();
+            register_singleton<IAddNewIncomeView, AddNewIncomeView>();
+            register_singleton<IViewIncomeHistory, ViewAllIncome>();
+            register_singleton<INotificationIconView, NotificationIconView>();
+            register_singleton<IStatusBarView, StatusBarView>();
+            register_singleton<IGettingStartedView, WelcomeScreen>();
+            register_singleton<ILogFileView, LogFileView>();
+            register.singleton<ITitleBar, TitleBar>();
+            register.singleton<ITaskTrayMessageView, TaskTrayMessage>();
 
-            register.transient<ISaveChangesView, SaveChangesView>();
-            register.transient<ICheckForUpdatesView, CheckForUpdatesView>();
-            register.transient<IUnhandledErrorView, UnhandledErrorView>();
+            register_singleton<ISelectFileToOpenDialog, SelectFileToOpenDialog>();
+            register_singleton<ISelectFileToSaveToDialog, SelectFileToSaveToDialog>();
+            register_singleton<ISaveChangesView, SaveChangesView>();
+            register_singleton<ICheckForUpdatesView, CheckForUpdatesView>();
+            register_singleton<IUnhandledErrorView, UnhandledErrorView>();
         }
 
-        void register_tab<Interface, View>() where View : Interface, new() where Interface : momoney.presentation.views.View
+        void register_singleton<Interface, View>() where View : Interface, new() where Interface : momoney.presentation.views.View
         {
             var view = new View();
             register.singleton<Interface>(() => view);

@@ -26,7 +26,7 @@ namespace MoMoney.boot
         public void run()
         {
             command.run();
-            processor.add(() => thread.Dispose());
+            thread.Dispose();
             processor.run();
         }
     }

@@ -11,8 +11,10 @@ using momoney.boot;
 using MoMoney.boot.container;
 using momoney.presentation.model.eventing;
 using MoMoney.Presentation.Presenters;
+using MoMoney.Presentation.Winforms.Views;
 using MoMoney.Service.Infrastructure.Eventing;
 using momoney.service.infrastructure.threading;
+using MoMoney.Service.Infrastructure.Threading;
 
 namespace MoMoney.boot
 {
@@ -29,7 +31,7 @@ namespace MoMoney.boot
         {
             using (new LogTime())
             {
-                Func<ISplashScreenPresenter> presenter = () => new SplashScreenPresenter();
+                Func<ISplashScreenPresenter> presenter = () => new SplashScreenPresenter(new IntervalTimer(), new SplashScreenView());
                 presenter = presenter.memorize();
 
                 var startup_screen = new DisplayTheSplashScreen(presenter).on_a_background_thread();

@@ -21,6 +21,7 @@ namespace MoMoney.Modules
             command.run<TaskTrayPresenter>();
             command.run<MainMenuPresenter>();
             command.run<UnhandledErrorPresenter>();
+            command.run<TitleBarPresenter>();
         }
     }
 }
\ No newline at end of file

@@ -152,7 +152,6 @@
     <Compile Include="modules\DatabaseModule.cs" />
     <Compile Include="modules\ApplicationMenuModule.cs" />
     <Compile Include="modules\GettingStartedModule.cs" />
-    <Compile Include="modules\TitleBarPresenter.cs" />
     <Compile Include="modules\ToolbarModule.cs" />
     <Compile Include="boot\hookup.cs" />
     <Compile Include="modules\core\LoadPresentationModulesCommand.cs" />
@@ -215,6 +214,10 @@
       <Project>{ACF52FAB-435B-48C9-A383-C787CB2D8000}</Project>
       <Name>dto</Name>
     </ProjectReference>
+    <ProjectReference Include="..\presentation.winforms\presentation.winforms.csproj">
+      <Project>{F3E06696-0CD2-46EE-B117-A05C1E7E8CD8}</Project>
+      <Name>presentation.winforms</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Presentation\presentation.csproj">
       <Project>{D7C83DB3-492D-4514-8C53-C57AD8E7ACE7}</Project>
       <Name>presentation</Name>

@@ -1,5 +1,4 @@
 using momoney.presentation.views;
-using MoMoney.Presentation.Views;
 using MoMoney.Service.Infrastructure.Eventing;
 
 namespace MoMoney.Presentation.Core

@@ -1,80 +1,80 @@
-using System.Collections.Generic;
-using momoney.presentation.model.menu.file;
-using MoMoney.Presentation.Model.Projects;
-using MoMoney.Presentation.Winforms.Keyboard;
-using MoMoney.Presentation.Winforms.Resources;
-
-namespace MoMoney.Presentation.Model.Menu.File
-{
-    public interface IFileMenu : ISubMenu
-    {
-    }
-
-    public class FileMenu : SubMenu, IFileMenu
-    {
-        readonly IProjectController project;
-
-        public FileMenu(IProjectController project)
-        {
-            this.project = project;
-        }
-
-        public override string name
-        {
-            get { return "&File"; }
-        }
-
-        public override IEnumerable<IMenuItem> all_menu_items()
-        {
-            yield return Create
-                .a_menu_item()
-                .named("&New")
-                .that_executes<INewCommand>()
-                .represented_by(ApplicationIcons.NewProject)
-                .can_be_accessed_with(ShortcutKeys.control.and(ShortcutKeys.N))
-                .build();
-
-            yield return Create
-                .a_menu_item()
-                .named("&Open")
-                .that_executes<IOpenCommand>()
-                .represented_by(ApplicationIcons.OpenProject)
-                .can_be_accessed_with(ShortcutKeys.control.and(ShortcutKeys.O))
-                .build();
-
-            yield return Create
-                .a_menu_item()
-                .named("&Save")
-                .that_executes<ISaveCommand>()
-                .represented_by(ApplicationIcons.SaveProject)
-                .can_be_clicked_when(() => project.has_unsaved_changes())
-                .can_be_accessed_with(ShortcutKeys.control.and(ShortcutKeys.S))
-                .build();
-
-            yield return Create
-                .a_menu_item()
-                .named("Save &As...")
-                .that_executes<ISaveAsCommand>()
-                .can_be_clicked_when(() => project.has_unsaved_changes())
-                .represented_by(ApplicationIcons.SaveProjectAs)
-                .build();
-
-            yield return Create
-                .a_menu_item()
-                .named("&Close")
-                .can_be_clicked_when(() => project.is_open())
-                .represented_by(ApplicationIcons.CloseProject)
-                .that_executes<ICloseCommand>()
-                .build();
-
-            yield return Create.a_menu_item_separator();
-
-            yield return Create
-                .a_menu_item()
-                .named("E&xit")
-                .that_executes<IExitCommand>()
-                .represented_by(ApplicationIcons.ExitApplication)
-                .build();
-        }
-    }
+using System.Collections.Generic;
+using momoney.presentation.model.menu.file;
+using MoMoney.Presentation.Model.Projects;
+using momoney.presentation.resources;
+using MoMoney.Presentation.Winforms.Keyboard;
+
+namespace MoMoney.Presentation.Model.Menu.File
+{
+    public interface IFileMenu : ISubMenu
+    {
+    }
+
+    public class FileMenu : SubMenu, IFileMenu
+    {
+        readonly IProjectController project;
+
+        public FileMenu(IProjectController project)
+        {
+            this.project = project;
+        }
+
+        public override string name
+        {
+            get { return "&File"; }
+        }
+
+        public override IEnumerable<IMenuItem> all_menu_items()
+        {
+            yield return Create
+                .a_menu_item()
+                .named("&New")
+                .that_executes<INewCommand>()
+                .represented_by(ApplicationIcons.NewProject)
+                .can_be_accessed_with(ShortcutKeys.control.and(ShortcutKeys.N))
+                .build();
+
+            yield return Create
+                .a_menu_item()
+                .named("&Open")
+                .that_executes<IOpenCommand>()
+                .represented_by(ApplicationIcons.OpenProject)
+                .can_be_accessed_with(ShortcutKeys.control.and(ShortcutKeys.O))
+                .build();
+
+            yield return Create
+                .a_menu_item()
+                .named("&Save")
+                .that_executes<ISaveCommand>()
+                .represented_by(ApplicationIcons.SaveProject)
+                .can_be_clicked_when(() => project.has_unsaved_changes())
+                .can_be_accessed_with(ShortcutKeys.control.and(ShortcutKeys.S))
+                .build();
+
+            yield return Create
+                .a_menu_item()
+                .named("Save &As...")
+                .that_executes<ISaveAsCommand>()
+                .can_be_clicked_when(() => project.has_unsaved_changes())
+                .represented_by(ApplicationIcons.SaveProjectAs)
+                .build();
+
+            yield return Create
+                .a_menu_item()
+                .named("&Close")
+                .can_be_clicked_when(() => project.is_open())
+                .represented_by(ApplicationIcons.CloseProject)
+                .that_executes<ICloseCommand>()
+                .build();
+
+            yield return Create.a_menu_item_separator();
+
+            yield return Create
+                .a_menu_item()
+                .named("E&xit")
+                .that_executes<IExitCommand>()
+                .represented_by(ApplicationIcons.ExitApplication)
+                .build();
+        }
+    }
 }
\ No newline at end of file

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using MoMoney.Presentation.Core;
 using MoMoney.Presentation.model.menu.help;
 using momoney.presentation.presenters;
-using MoMoney.Presentation.Winforms.Resources;
+using momoney.presentation.resources;
 
 namespace MoMoney.Presentation.Model.Menu.Help
 {

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using momoney.presentation.model.menu.file;
-using MoMoney.Presentation.Winforms.Resources;
-
+using momoney.presentation.model.menu.file;
+using momoney.presentation.resources;
+
 namespace MoMoney.Presentation.Model.Menu.window
 {
     public interface IWindowMenu : ISubMenu

@@ -1,7 +1,7 @@
 using System;
-using gorilla.commons.utility;
-using MoMoney.Presentation.Winforms.Resources;
-
+using gorilla.commons.utility;
+using momoney.presentation.resources;
+
 namespace MoMoney.Presentation.Model.Menu
 {
     public interface IToolbarItemBuilder

@@ -1,8 +1,8 @@
 using System;
-using System.Windows.Forms;
-using MoMoney.Presentation.Winforms.Keyboard;
-using MoMoney.Presentation.Winforms.Resources;
-
+using System.Windows.Forms;
+using momoney.presentation.resources;
+using MoMoney.Presentation.Winforms.Keyboard;
+
 namespace MoMoney.Presentation.Model.Menu
 {
     public interface IMenuItem

@@ -1,87 +1,84 @@
-using System;
-using Gorilla.Commons.Infrastructure.Container;
-using gorilla.commons.utility;
-using MoMoney.Presentation.Winforms.Keyboard;
-using MoMoney.Presentation.Winforms.Resources;
-using MoMoney.Service.Infrastructure.Eventing;
-using MoMoney.Service.Infrastructure.Threading;
-
-namespace MoMoney.Presentation.Model.Menu
-{
-    public interface IMenuItemBuilder : Builder<IMenuItem>
-    {
-        IMenuItemBuilder named(string name);
-        IMenuItemBuilder that_executes<TheCommand>() where TheCommand : Command;
-        IMenuItemBuilder that_executes(Action action);
-        IMenuItemBuilder represented_by(HybridIcon project);
-        IMenuItemBuilder can_be_accessed_with(ShortcutKey hot_key);
-        IMenuItemBuilder can_be_clicked_when(Func<bool> predicate);
-    }
-
-    public class MenuItemBuilder : IMenuItemBuilder
-    {
-        readonly DependencyRegistry registry;
-        readonly EventAggregator aggregator;
-        readonly CommandProcessor processor;
-
-        string name_of_the_menu { get; set; }
-        Action command_to_execute { get; set; }
-        HybridIcon icon { get; set; }
-        ShortcutKey key { get; set; }
-        Func<bool> can_be_clicked = () => true;
-
-        public MenuItemBuilder(DependencyRegistry registry, EventAggregator aggregator, CommandProcessor processor)
-        {
-            name_of_the_menu = "Unknown";
-            command_to_execute = () => {};
-            this.registry = registry;
-            this.processor = processor;
-            this.aggregator = aggregator;
-            icon = ApplicationIcons.Empty;
-            key = ShortcutKeys.none;
-        }
-
-        public IMenuItemBuilder named(string name)
-        {
-            name_of_the_menu = name;
-            return this;
-        }
-
-        public IMenuItemBuilder that_executes<TheCommand>() where TheCommand : Command
-        {
-            command_to_execute = () => processor.add(registry.get_a<TheCommand>());
-            return this;
-        }
-
-        public IMenuItemBuilder that_executes(Action action)
-        {
-            command_to_execute = action;
-            return this;
-        }
-
-        public IMenuItemBuilder represented_by(HybridIcon project)
-        {
-            icon = project;
-            return this;
-        }
-
-        public IMenuItemBuilder can_be_accessed_with(ShortcutKey hot_key)
-        {
-            key = hot_key;
-            return this;
-        }
-
-        public IMenuItemBuilder can_be_clicked_when(Func<bool> predicate)
-        {
-            can_be_clicked = predicate;
-            return this;
-        }
-
-        public IMenuItem build()
-        {
-            var item = new MenuItem(name_of_the_menu, command_to_execute, icon, key, can_be_clicked);
-            aggregator.subscribe(item);
-            return item;
-        }
-    }
+using System;
+using Gorilla.Commons.Infrastructure.Container;
+using gorilla.commons.utility;
+using momoney.presentation.resources;
+using MoMoney.Presentation.Winforms.Keyboard;
+using MoMoney.Service.Infrastructure.Eventing;
+
+namespace MoMoney.Presentation.Model.Menu
+{
+    public interface IMenuItemBuilder : Builder<IMenuItem>
+    {
+        IMenuItemBuilder named(string name);
+        IMenuItemBuilder that_executes<TheCommand>() where TheCommand : Command;
+        IMenuItemBuilder that_executes(Action action);
+        IMenuItemBuilder represented_by(HybridIcon project);
+        IMenuItemBuilder can_be_accessed_with(ShortcutKey hot_key);
+        IMenuItemBuilder can_be_clicked_when(Func<bool> predicate);
+    }
+
+    public class MenuItemBuilder : IMenuItemBuilder
+    {
+        readonly DependencyRegistry registry;
+        readonly EventAggregator aggregator;
+
+        string name_of_the_menu { get; set; }
+        Action command_to_execute { get; set; }
+        HybridIcon icon { get; set; }
+        ShortcutKey key { get; set; }
+        Func<bool> can_be_clicked = () => true;
+
+        public MenuItemBuilder(DependencyRegistry registry, EventAggregator aggregator)
+        {
+            name_of_the_menu = "Unknown";
+            command_to_execute = () => {};
+            this.registry = registry;
+            this.aggregator = aggregator;
+            icon = ApplicationIcons.Empty;
+            key = ShortcutKeys.none;
+        }
+
+        public IMenuItemBuilder named(string name)
+        {
+            name_of_the_menu = name;
+            return this;
+        }
+
+        public IMenuItemBuilder that_executes<TheCommand>() where TheCommand : Command
+        {
+            command_to_execute = () => registry.get_a<TheCommand>().run();
+            return this;
+        }
+
+        public IMenuItemBuilder that_executes(Action action)
+        {
+            command_to_execute = action;
+            return this;
+        }
+
+        public IMenuItemBuilder represented_by(HybridIcon project)
+        {
+            icon = project;
+            return this;
+        }
+
+        public IMenuItemBuilder can_be_accessed_with(ShortcutKey hot_key)
+        {
+            key = hot_key;
+            return this;
+        }
+
+        public IMenuItemBuilder can_be_clicked_when(Func<bool> predicate)
+        {
+            can_be_clicked = predicate;
+            return this;
+        }
+
+        public IMenuItem build()
+        {
+            var item = new MenuItem(name_of_the_menu, command_to_execute, icon, key, can_be_clicked);
+            aggregator.subscribe(item);
+            return item;
+        }
+    }
 }
\ No newline at end of file

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using gorilla.commons.utility;
-using MoMoney.Presentation.Winforms.Helpers;
+//using MoMoney.Presentation.Winforms.Helpers;
 
 namespace MoMoney.Presentation.Model.Menu
 {
@@ -13,7 +13,7 @@ namespace MoMoney.Presentation.Model.Menu
 
         public void add_to(MenuStrip strip)
         {
-            using (new SuspendLayout(strip))
+            //using (new SuspendLayout(strip))
             {
                 var menu_item = new ToolStripMenuItem(name);
                 strip.Items.Add(menu_item);

@@ -1,66 +1,63 @@
-using System;
-using System.Windows.Forms;
-using Gorilla.Commons.Infrastructure.Container;
-using MoMoney.Presentation.Winforms.Resources;
-using MoMoney.Service.Infrastructure.Eventing;
-using MoMoney.Service.Infrastructure.Threading;
-
-namespace MoMoney.Presentation.Model.Menu
-{
-    public class ToolBarItemBuilder : IToolbarItemBuilder, IToolbarButton
-    {
-        readonly DependencyRegistry registry;
-        readonly ToolStripButton item;
-        readonly CommandProcessor processor;
-        Func<bool> the_condition;
-
-        public ToolBarItemBuilder(DependencyRegistry registry, EventAggregator aggregator, CommandProcessor processor)
-        {
-            this.registry = registry;
-            this.processor = processor;
-            aggregator.subscribe(this);
-            the_condition = () => true;
-            item = new ToolStripButton {};
-        }
-
-        public IToolbarItemBuilder with_tool_tip_text_as(string text)
-        {
-            item.Text = text;
-            return this;
-        }
-
-        public IToolbarItemBuilder when_clicked_executes<Command>() where Command : gorilla.commons.utility.Command
-        {
-            item.Click += (sender, args) => processor.add(registry.get_a<Command>());
-            return this;
-        }
-
-        public IToolbarItemBuilder displays_icon(HybridIcon icon)
-        {
-            item.Image = icon;
-            return this;
-        }
-
-        public IToolbarItemBuilder can_be_clicked_when(Func<bool> condition)
-        {
-            the_condition = condition;
-            item.Enabled = condition();
-            return this;
-        }
-
-        public IToolbarButton button()
-        {
-            return this;
-        }
-
-        public void add_to(ToolStrip tool_strip)
-        {
-            tool_strip.Items.Add(item);
-        }
-
-        public void refresh()
-        {
-            item.Enabled = the_condition();
-        }
-    }
+using System;
+using System.Windows.Forms;
+using Gorilla.Commons.Infrastructure.Container;
+using momoney.presentation.resources;
+using MoMoney.Service.Infrastructure.Eventing;
+
+namespace MoMoney.Presentation.Model.Menu
+{
+    public class ToolBarItemBuilder : IToolbarItemBuilder, IToolbarButton
+    {
+        readonly DependencyRegistry registry;
+        readonly ToolStripButton item;
+        Func<bool> the_condition;
+
+        public ToolBarItemBuilder(DependencyRegistry registry, EventAggregator aggregator)
+        {
+            this.registry = registry;
+            aggregator.subscribe(this);
+            the_condition = () => true;
+            item = new ToolStripButton {};
+        }
+
+        public IToolbarItemBuilder with_tool_tip_text_as(string text)
+        {
+            item.Text = text;
+            return this;
+        }
+
+        public IToolbarItemBuilder when_clicked_executes<Command>() where Command : gorilla.commons.utility.Command
+        {
+            item.Click += (sender, args) => registry.get_a<Command>().run();
+            return this;
+        }
+
+        public IToolbarItemBuilder displays_icon(HybridIcon icon)
+        {
+            item.Image = icon;
+            return this;
+        }
+
+        public IToolbarItemBuilder can_be_clicked_when(Func<bool> condition)
+        {
+            the_condition = condition;
+            item.Enabled = condition();
+            return this;
+        }
+
+        public IToolbarButton button()
+        {
+            return this;
+        }
+
+        public void add_to(ToolStrip tool_strip)
+        {
+            tool_strip.Items.Add(item);
+        }
+
+        public void refresh()
+        {
+            item.Enabled = the_condition();
+        }
+    }
 }
\ No newline at end of file

@@ -1,8 +0,0 @@
-using MoMoney.Service.Infrastructure.Eventing;
-
-namespace MoMoney.Presentation.Model.messages
-{
-    public class ClosingProjectEvent : IEvent
-    {
-    }
-}
\ No newline at end of file

@@ -1,8 +0,0 @@
-using MoMoney.Service.Infrastructure.Eventing;
-
-namespace MoMoney.Presentation.Model.messages
-{
-    public class ClosingTheApplication : IEvent
-    {
-    }
-}
\ No newline at end of file

@@ -1,14 +0,0 @@
-using MoMoney.Service.Infrastructure.Eventing;
-
-namespace MoMoney.Presentation.Model.messages
-{
-    public class FinishedRunningCommand : IEvent
-    {
-        public FinishedRunningCommand(object running_command)
-        {
-            completed_action = running_command;
-        }
-
-        public object completed_action { get; private set; }
-    }
-}
\ No newline at end of file

@@ -1,14 +0,0 @@
-using MoMoney.Service.Infrastructure.Eventing;
-
-namespace MoMoney.Presentation.Model.messages
-{
-    public class NewProjectOpened : IEvent
-    {
-        public NewProjectOpened(string path)
-        {
-            this.path = path;
-        }
-
-        public string path { private set; get; }
-    }
-}
\ No newline at end of file

@@ -1,8 +0,0 @@
-using MoMoney.Service.Infrastructure.Eventing;
-
-namespace MoMoney.Presentation.Model.messages
-{
-    public class SavedChangesEvent : IEvent
-    {
-    }
-}
\ No newline at end of file

@@ -1,14 +0,0 @@
-using MoMoney.Service.Infrastructure.Eventing;
-
-namespace MoMoney.Presentation.Model.messages
-{
-    public class StartedRunningCommand : IEvent
-    {
-        public StartedRunningCommand(object running_command)
-        {
-            running_action = running_command;
-        }
-
-        public object running_action { get; private set; }
-    }
-}
\ No newline at end of file

@@ -1,15 +0,0 @@
-using System;
-using MoMoney.Service.Infrastructure.Eventing;
-
-namespace MoMoney.Presentation.Model.messages
-{
-    public class UnhandledErrorOccurred : IEvent
-    {
-        public UnhandledErrorOccurred(Exception error)
-        {
-            this.error = error;
-        }
-
-        public Exception error { get; private set; }
-    }
-}
\ No newline at end of file

@@ -1,8 +0,0 @@
-using MoMoney.Service.Infrastructure.Eventing;
-
-namespace MoMoney.Presentation.Model.messages
-{
-    public class UnsavedChangesEvent : IEvent
-    {
-    }
-}
\ No newline at end of file

@@ -1,5 +1,5 @@
-using momoney.presentation.presenters;
-using MoMoney.Presentation.Winforms.Resources;
+using momoney.presentation.presenters;
+using momoney.presentation.resources;
 using XPExplorerBar;
 
 namespace MoMoney.Presentation.Presenters

@@ -1,5 +1,5 @@
-using momoney.presentation.presenters;
-using MoMoney.Presentation.Winforms.Resources;
+using momoney.presentation.presenters;
+using momoney.presentation.resources;
 using XPExplorerBar;
 
 namespace MoMoney.Presentation.Presenters

@@ -1,5 +1,5 @@
-using momoney.presentation.presenters;
-using MoMoney.Presentation.Winforms.Resources;
+using momoney.presentation.presenters;
+using momoney.presentation.resources;
 using XPExplorerBar;
 
 namespace MoMoney.Presentation.Presenters

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using MoMoney.DTO;
-using momoney.presentation.presenters;
-using MoMoney.Presentation.Views;
-using MoMoney.Presentation.Winforms.Resources;
+using momoney.presentation.presenters;
+using momoney.presentation.resources;
+using MoMoney.Presentation.Views;
 using MoMoney.Service.Contracts.Application;
 using XPExplorerBar;
 

@@ -5,7 +5,6 @@ using Gorilla.Commons.Utility;
 using MoMoney.Presentation.Core;
 using MoMoney.Presentation.Presenters;
 using momoney.presentation.views;
-using MoMoney.Presentation.Views;
 using momoney.service.infrastructure.updating;
 
 namespace momoney.presentation.presenters

@@ -1,8 +1,8 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-using gorilla.commons.utility;
-using MoMoney.Presentation.Winforms.Resources;
+using gorilla.commons.utility;
+using momoney.presentation.resources;
 using XPExplorerBar;
 
 namespace MoMoney.Presentation.Presenters

@@ -4,8 +4,8 @@ using momoney.presentation.model.eventing;
 using MoMoney.Presentation.Model.Menu.File;
 using MoMoney.Presentation.Model.Menu.Help;
 using MoMoney.Presentation.Model.Menu.window;
+using momoney.presentation.resources;
 using momoney.presentation.views;
-using MoMoney.Presentation.Winforms.Resources;
 using MoMoney.Service.Infrastructure.Eventing;
 
 namespace momoney.presentation.presenters

@@ -1,6 +1,5 @@
 using gorilla.commons.utility;
 using MoMoney.Presentation.Core;
-using MoMoney.Service.Infrastructure.Threading;
 
 namespace momoney.presentation.presenters
 {
@@ -9,17 +8,15 @@ namespace momoney.presentation.presenters
     public class RunThe<TPresenter> : IRunThe<TPresenter> where TPresenter : Presenter
     {
         readonly IApplicationController controller;
-        readonly CommandProcessor processor;
 
-        public RunThe(IApplicationController controller, CommandProcessor processor)
+        public RunThe(IApplicationController controller)
         {
             this.controller = controller;
-            this.processor = processor;
         }
 
         public void run()
         {
-            processor.add(() => controller.run<TPresenter>());
+            controller.run<TPresenter>();
         }
     }
 }
\ No newline at end of file

@@ -1,7 +1,6 @@
 using gorilla.commons.Utility;
 using momoney.presentation.presenters;
 using momoney.presentation.views;
-using MoMoney.Presentation.Winforms.Views;
 using momoney.service.infrastructure.threading;
 using MoMoney.Service.Infrastructure.Threading;
 
@@ -15,8 +14,6 @@ namespace MoMoney.Presentation.Presenters
         readonly ISplashScreenView view;
         ISplashScreenState current_state;
 
-        public SplashScreenPresenter() : this(new IntervalTimer(), new SplashScreenView()) {}
-
         public SplashScreenPresenter(ITimer timer, ISplashScreenView view)
         {
             this.timer = timer;

@@ -3,9 +3,9 @@ using gorilla.commons.utility;
 using Gorilla.Commons.Utility;
 using MoMoney.Presentation.Core;
 using momoney.presentation.model.eventing;
+using momoney.presentation.resources;
 using momoney.presentation.views;
 using MoMoney.Presentation.Views;
-using MoMoney.Presentation.Winforms.Resources;
 using MoMoney.Service.Infrastructure.Eventing;
 using MoMoney.Service.Infrastructure.Threading;
 

@@ -2,7 +2,6 @@ using gorilla.commons.utility;
 using MoMoney.Presentation.Core;
 using momoney.presentation.model.eventing;
 using momoney.presentation.views;
-using MoMoney.Presentation.Views;
 using MoMoney.Service.Infrastructure.Eventing;
 
 namespace momoney.presentation.presenters

@@ -1,13 +1,14 @@
-using MoMoney.Presentation;
+using MoMoney.Presentation.Core;
 using momoney.presentation.model.eventing;
 using MoMoney.Presentation.Model.Projects;
+using momoney.presentation.views;
 using MoMoney.Presentation.Views;
 using MoMoney.Service.Infrastructure.Eventing;
 
-namespace momoney.modules
+namespace momoney.presentation.presenters
 {
     public class TitleBarPresenter :
-        IModule,
+        Presenter,
         EventSubscriber<UnsavedChangesEvent>,
         EventSubscriber<SavedChangesEvent>,
         EventSubscriber<NewProjectOpened>,
@@ -15,6 +16,7 @@ namespace momoney.modules
     {
         readonly ITitleBar view;
         readonly IProjectController project;
+        public Shell shell { get; private set; }
 
         public TitleBarPresenter(ITitleBar view, IProjectController project)
         {
@@ -22,8 +24,9 @@ namespace momoney.modules
             this.project = project;
         }
 
-        public void run()
+        public void present(Shell shell)
         {
+            this.shell = shell;
             view.display(project.name());
         }
 

@@ -4,11 +4,11 @@ using gorilla.commons.utility;
 using MoMoney.Presentation.Core;
 using MoMoney.Presentation.Model.Menu;
 using momoney.presentation.model.menu.file;
-using MoMoney.Presentation.Model.Projects;
+using MoMoney.Presentation.Model.Projects;
+using momoney.presentation.resources;
 using momoney.presentation.views;
-using MoMoney.Presentation.Views;
-using MoMoney.Presentation.Winforms.Resources;
-
+using MoMoney.Presentation.Views;
+
 namespace momoney.presentation.presenters
 {
     public class ToolBarPresenter : Presenter

@@ -1,9 +1,9 @@
-using System;
-using System.Drawing;
-using System.IO;
-using Gorilla.Commons.Infrastructure.Reflection;
-
-namespace MoMoney.Presentation.Winforms.Resources
+using System;
+using System.Drawing;
+using System.IO;
+using Gorilla.Commons.Infrastructure.Reflection;
+
+namespace momoney.presentation.resources
 {
     public class ApplicationIcon : IDisposable
     {

@@ -1,7 +1,7 @@
-using System.Collections.Generic;
-using gorilla.commons.utility;
-
-namespace MoMoney.Presentation.Winforms.Resources
+using System.Collections.Generic;
+using gorilla.commons.utility;
+
+namespace momoney.presentation.resources
 {
     static public class ApplicationIcons
     {

@@ -1,9 +1,9 @@
-using System;
-using System.Drawing;
-using System.IO;
-using Gorilla.Commons.Infrastructure.Reflection;
-
-namespace MoMoney.Presentation.Winforms.Resources
+using System;
+using System.Drawing;
+using System.IO;
+using Gorilla.Commons.Infrastructure.Reflection;
+
+namespace momoney.presentation.resources
 {
     public class ApplicationImage : IDisposable
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Winforms.Resources
+namespace momoney.presentation.resources
 {
     public static class ApplicationImages
     {

@@ -1,7 +1,7 @@
-using System;
-using System.Drawing;
-
-namespace MoMoney.Presentation.Winforms.Resources
+using System;
+using System.Drawing;
+
+namespace momoney.presentation.resources
 {
     public class HybridIcon : ApplicationIcon
     {

@@ -1,5 +1,4 @@
 using MoMoney.Presentation.Core;
-using MoMoney.Presentation.Views;
 
 namespace momoney.presentation.views
 {

@@ -1,5 +1,5 @@
+using momoney.presentation.resources;
 using momoney.presentation.views;
-using MoMoney.Presentation.Winforms.Resources;
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace MoMoney.Presentation.Views

@@ -1,9 +1,10 @@
+using System;
 using momoney.presentation.presenters;
-using MoMoney.Presentation.Winforms.Resources;
+using momoney.presentation.resources;
 
 namespace momoney.presentation.views
 {
-    public interface INotificationIconView : View<NotificationIconPresenter>
+    public interface INotificationIconView : View<NotificationIconPresenter>, IDisposable
     {
         void display(ApplicationIcon icon_to_display, string text_to_display);
         void opened_new_project();

@@ -2,7 +2,7 @@ using Gorilla.Commons.Infrastructure.FileSystem;
 
 namespace momoney.presentation.views
 {
-    public interface ISelectFileToOpenDialog
+    public interface ISelectFileToOpenDialog : View
     {
         File tell_me_the_path_to_the_file();
     }

@@ -2,7 +2,7 @@ using Gorilla.Commons.Infrastructure.FileSystem;
 
 namespace momoney.presentation.views
 {
-    public interface ISelectFileToSaveToDialog
+    public interface ISelectFileToSaveToDialog : View
     {
         File tell_me_the_path_to_the_file();
     }

@@ -1,6 +1,6 @@
 using momoney.presentation.presenters;
+using momoney.presentation.resources;
 using momoney.presentation.views;
-using MoMoney.Presentation.Winforms.Resources;
 using momoney.service.infrastructure.threading;
 
 namespace MoMoney.Presentation.Views

@@ -1,7 +1,9 @@
-namespace momoney.presentation.views
-{
-    public interface ITaskTrayMessageView
-    {
-        void display(string message, params object[] arguments);
-    }
+using momoney.presentation.presenters;
+
+namespace momoney.presentation.views
+{
+    public interface ITaskTrayMessageView : View<TaskTrayPresenter>
+    {
+        void display(string message, params object[] arguments);
+    }
 }
\ No newline at end of file

@@ -1,9 +1,12 @@
-namespace MoMoney.Presentation.Views
-{
-    public interface ITitleBar
-    {
-        void display(string title);
-        void append_asterik();
-        void remove_asterik();
-    }
+using momoney.presentation.presenters;
+using momoney.presentation.views;
+
+namespace MoMoney.Presentation.Views
+{
+    public interface ITitleBar : View<TitleBarPresenter>
+    {
+        void display(string title);
+        void append_asterik();
+        void remove_asterik();
+    }
 }
\ No newline at end of file

@@ -1,11 +1,9 @@
 using System;
-using System.ComponentModel;
 
 namespace momoney.presentation.views
 {
-    public interface View : ISynchronizeInvoke, IDisposable
-    {
-    }
+    public interface View //: IDisposable 
+    {}
 
     public interface View<Presenter> : View where Presenter : MoMoney.Presentation.Core.Presenter
     {

@@ -1,27 +0,0 @@
-using System.Windows.Forms;
-using Gorilla.Commons.Infrastructure.FileSystem;
-using momoney.presentation.views;
-
-namespace MoMoney.Presentation.Winforms.Views
-{
-    public class SelectFileToOpenDialog : ISelectFileToOpenDialog
-    {
-        readonly IWin32Window window;
-        readonly FileDialog dialog;
-
-        public SelectFileToOpenDialog(IWin32Window window)
-        {
-            this.window = window;
-            dialog = new OpenFileDialog {Filter = "My Money Files (*.mo)|*.mo"};
-        }
-
-        public File tell_me_the_path_to_the_file()
-        {
-            var result = dialog.ShowDialog(window);
-            var path_to_the_file =
-                (ApplicationFile) (result.Equals(DialogResult.Cancel) ? string.Empty : dialog.FileName);
-            dialog.Dispose();
-            return path_to_the_file;
-        }
-    }
-}
\ No newline at end of file

@@ -1,26 +0,0 @@
-using System.Windows.Forms;
-using Gorilla.Commons.Infrastructure.FileSystem;
-using momoney.presentation.views;
-
-namespace MoMoney.Presentation.Winforms.Views
-{
-    public class SelectFileToSaveToDialog : ISelectFileToSaveToDialog
-    {
-        readonly FileDialog dialog;
-        readonly IWin32Window window;
-
-        public SelectFileToSaveToDialog(IWin32Window window)
-        {
-            dialog = new SaveFileDialog {Filter = "My Money Files (*.mo)|*.mo"};
-            this.window = window;
-        }
-
-        public File tell_me_the_path_to_the_file()
-        {
-            var result = dialog.ShowDialog(window);
-            var the_path = (ApplicationFile) (result == DialogResult.Cancel ? string.Empty : dialog.FileName);
-            dialog.Dispose();
-            return the_path;
-        }
-    }
-}
\ No newline at end of file

@@ -1,20 +0,0 @@
-using gorilla.commons.utility;
-using momoney.presentation.views;
-
-namespace MoMoney.Presentation.Winforms.Views
-{
-    public class TaskTrayMessage : ITaskTrayMessageView
-    {
-        readonly INotificationIconView view;
-
-        public TaskTrayMessage(INotificationIconView view)
-        {
-            this.view = view;
-        }
-
-        public void display(string message, params object[] arguments)
-        {
-            view.show_popup_message(message.formatted_using(arguments));
-        }
-    }
-}
\ No newline at end of file

@@ -1,39 +0,0 @@
-using System.Windows.Forms;
-using momoney.presentation.views;
-using MoMoney.Presentation.Views;
-
-namespace MoMoney.Presentation.Winforms.Views
-{
-    public class TitleBar : ITitleBar
-    {
-        readonly IRegionManager shell;
-
-        public TitleBar(IRegionManager shell)
-        {
-            this.shell = shell;
-        }
-
-        public void display(string title)
-        {
-            shell.region<Form>(x =>
-                                   {
-                                       if (x.Text.Contains("-")) x.Text = x.Text.Remove(x.Text.IndexOf("-") - 1);
-                                       x.Text = x.Text + " - " + title;
-                                   });
-        }
-
-        public void append_asterik()
-        {
-            shell.region<Form>(x =>
-                                   {
-                                       if (x.Text.Contains("*")) return;
-                                       x.Text = x.Text + "*";
-                                   });
-        }
-
-        public void remove_asterik()
-        {
-            shell.region<Form>(x => { x.Text = x.Text.Replace("*", ""); });
-        }
-    }
-}
\ No newline at end of file

@@ -162,6 +162,7 @@
     <Compile Include="presenters\AddBillPaymentPresenter.cs" />
     <Compile Include="presenters\IRunPresenterCommand.cs" />
     <Compile Include="presenters\TaskTrayPresenter.cs" />
+    <Compile Include="presenters\TitleBarPresenter.cs" />
     <Compile Include="presenters\UnhandledErrorPresenter.cs" />
     <Compile Include="presenters\ViewAllBillsPresenter.cs" />
     <Compile Include="presenters\RestartCommand.cs" />
@@ -201,6 +202,11 @@
     <Compile Include="presenters\SplashScreenPresenter.cs" />
     <Compile Include="presenters\CheckForUpdatesPresenter.cs" />
     <Compile Include="presenters\ProcessQueryCommand.cs" />
+    <Compile Include="resources\ApplicationIcon.cs" />
+    <Compile Include="resources\ApplicationIcons.cs" />
+    <Compile Include="resources\ApplicationImage.cs" />
+    <Compile Include="resources\ApplicationImages.cs" />
+    <Compile Include="resources\HybridIcon.cs" />
     <Compile Include="views\Dialog.cs" />
     <Compile Include="views\ISelectFileToOpenDialog.cs" />
     <Compile Include="views\ISelectFileToSaveToDialog.cs" />
@@ -210,110 +216,20 @@
     <Compile Include="views\IApplicationDockedWindow.cs" />
     <Compile Include="views\IApplicationWindow.cs" />
     <Compile Include="views\IViewAllIncomeReport.cs" />
-    <Compile Include="winforms\helpers\GridListControl.cs" />
-    <Compile Include="winforms\helpers\ListViewControl.cs" />
-    <Compile Include="winforms\resources\ApplicationIcons.cs" />
-    <Compile Include="winforms\resources\ApplicationImages.cs" />
     <Compile Include="presenters\RunQueryCommand.cs" />
-    <Compile Include="winforms\views\AddCompanyView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\AddCompanyView.Designer.cs">
-      <DependentUpon>AddCompanyView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="winforms\views\AddBillPaymentView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\AddBillPaymentView.Designer.cs">
-      <DependentUpon>AddBillPaymentView.cs</DependentUpon>
-    </Compile>
     <Compile Include="views\IAddBillPaymentView.cs" />
     <Compile Include="views\IViewAllBills.cs" />
-    <Compile Include="winforms\views\ViewAllIncomesReport.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="winforms\views\ViewAllIncomesReport.Designer.cs">
-      <DependentUpon>ViewAllIncomesReport.cs</DependentUpon>
-    </Compile>
-    <Compile Include="winforms\views\ViewAllBills.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\ViewAllBills.Designer.cs">
-      <DependentUpon>ViewAllBills.cs</DependentUpon>
-    </Compile>
-    <Compile Include="winforms\views\ViewAllBillsReport.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="winforms\views\ViewAllBillsReport.Designer.cs">
-      <DependentUpon>ViewAllBillsReport.cs</DependentUpon>
-    </Compile>
-    <Compile Include="winforms\views\ApplicationDockedWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\ApplicationDockedWindow.Designer.cs">
-      <DependentUpon>ApplicationDockedWindow.cs</DependentUpon>
-    </Compile>
-    <Compile Include="winforms\views\ApplicationWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\ApplicationWindow.Designer.cs">
-      <DependentUpon>ApplicationWindow.cs</DependentUpon>
-    </Compile>
     <Compile Include="views\ControlAction.cs" />
     <Compile Include="views\IDialogLauncher.cs" />
     <Compile Include="views\ITab.cs" />
     <Compile Include="views\View.cs" />
     <Compile Include="views\ISaveChangesView.cs" />
-    <Compile Include="winforms\views\SaveChangesView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\SaveChangesView.Designer.cs">
-      <DependentUpon>SaveChangesView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="winforms\views\SelectFileToOpenDialog.cs" />
-    <Compile Include="winforms\views\SelectFileToSaveToDialog.cs" />
     <Compile Include="views\IAddCompanyView.cs" />
-    <Compile Include="winforms\views\AddNewIncomeView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\AddNewIncomeView.Designer.cs">
-      <DependentUpon>AddNewIncomeView.cs</DependentUpon>
-    </Compile>
     <Compile Include="views\IAddNewIncomeView.cs" />
     <Compile Include="views\IViewIncomeHistory.cs" />
-    <Compile Include="winforms\views\ViewAllIncome.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\ViewAllIncome.Designer.cs">
-      <DependentUpon>ViewAllIncome.cs</DependentUpon>
-    </Compile>
-    <Compile Include="winforms\views\AboutTheApplicationView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\AboutTheApplicationView.Designer.cs">
-      <DependentUpon>AboutTheApplicationView.cs</DependentUpon>
-    </Compile>
     <Compile Include="views\IAboutApplicationView.cs" />
     <Compile Include="views\IMainMenuView.cs" />
-    <Compile Include="winforms\views\MainMenuView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\MainMenuView.Designer.cs">
-      <DependentUpon>MainMenuView.cs</DependentUpon>
-    </Compile>
     <Compile Include="views\IReportViewer.cs" />
-    <Compile Include="winforms\views\ReportViewer.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\ReportViewer.Designer.cs">
-      <DependentUpon>ReportViewer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="winforms\views\ApplicationShell.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\ApplicationShell.Designer.cs">
-      <DependentUpon>ApplicationShell.cs</DependentUpon>
-    </Compile>
     <Compile Include="views\IGettingStartedView.cs" />
     <Compile Include="views\ILogFileView.cs" />
     <Compile Include="views\INotificationIconView.cs" />
@@ -321,157 +237,13 @@
     <Compile Include="views\Shell.cs" />
     <Compile Include="views\IStatusBarView.cs" />
     <Compile Include="views\IUnhandledErrorView.cs" />
-    <Compile Include="winforms\views\LogFileView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\LogFileView.Designer.cs">
-      <DependentUpon>LogFileView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="winforms\views\NotificationIconView.cs" />
-    <Compile Include="winforms\views\StatusBarView.cs" />
-    <Compile Include="winforms\views\TaskTrayMessage.cs" />
-    <Compile Include="winforms\views\TitleBar.cs" />
-    <Compile Include="winforms\views\UnhandledErrorView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\UnhandledErrorView.Designer.cs">
-      <DependentUpon>UnhandledErrorView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="winforms\views\WelcomeScreen.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\WelcomeScreen.Designer.cs">
-      <DependentUpon>WelcomeScreen.cs</DependentUpon>
-    </Compile>
     <Compile Include="views\ISplashScreenView.cs" />
-    <Compile Include="winforms\views\SplashScreenView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\SplashScreenView.Designer.cs">
-      <DependentUpon>SplashScreenView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="winforms\views\CheckForUpdatesView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="winforms\views\CheckForUpdatesView.Designer.cs">
-      <DependentUpon>CheckForUpdatesView.cs</DependentUpon>
-    </Compile>
     <Compile Include="views\ICheckForUpdatesView.cs" />
-    <Compile Include="winforms\databinding\BindingSelector.cs" />
-    <Compile Include="winforms\databinding\ComboBoxPropertyBinding.cs" />
-    <Compile Include="winforms\databinding\ControlBindingExtensions.cs" />
-    <Compile Include="winforms\databinding\Create.cs" />
-    <Compile Include="winforms\databinding\DateTimePickerPropertyBinding.cs" />
-    <Compile Include="winforms\databinding\IPropertyBinding.cs" />
-    <Compile Include="winforms\databinding\ListboxExtensions.cs" />
-    <Compile Include="winforms\databinding\PropertyBinder.cs" />
-    <Compile Include="winforms\databinding\PropertyInspector.cs" />
-    <Compile Include="winforms\databinding\PropertyInspectorFactory.cs" />
-    <Compile Include="winforms\databinding\TextBoxExtensions.cs" />
-    <Compile Include="winforms\databinding\TextPropertyBinding.cs" />
-    <Compile Include="winforms\helpers\BindableListBox.cs" />
-    <Compile Include="winforms\helpers\BindableListExtensions.cs" />
-    <Compile Include="winforms\helpers\BindableListFactory.cs" />
-    <Compile Include="winforms\helpers\BindableTextBox.cs" />
-    <Compile Include="winforms\helpers\BindableTextBoxExtensions.cs" />
-    <Compile Include="winforms\helpers\BitmapRegion.cs" />
-    <Compile Include="winforms\helpers\ButtonExtensions.cs" />
-    <Compile Include="winforms\helpers\ComboBoxListControl.cs" />
-    <Compile Include="winforms\helpers\ControlAdapter.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="winforms\helpers\ControlExtensions.cs" />
-    <Compile Include="winforms\helpers\Events.cs" />
-    <Compile Include="winforms\helpers\EventTrigger.cs" />
-    <Compile Include="winforms\helpers\EventTriggerExtensions.cs" />
-    <Compile Include="winforms\helpers\IBindableList.cs" />
-    <Compile Include="winforms\helpers\IEventTarget.cs" />
-    <Compile Include="winforms\helpers\IListControl.cs" />
-    <Compile Include="winforms\helpers\ITextBoxCommand.cs" />
-    <Compile Include="winforms\helpers\ITextControl.cs" />
-    <Compile Include="winforms\helpers\ListBoxListControl.cs" />
-    <Compile Include="winforms\helpers\RebindTextBoxCommand.cs" />
-    <Compile Include="winforms\helpers\SuspendLayout.cs" />
-    <Compile Include="winforms\helpers\TextControl.cs" />
     <Compile Include="winforms\keyboard\ShortcutKey.cs" />
     <Compile Include="winforms\keyboard\ShortcutKeys.cs" />
-    <Compile Include="winforms\krypton\BindableListExtensions.cs" />
-    <Compile Include="winforms\krypton\KryptonComboBoxListControl.cs" />
-    <Compile Include="winforms\krypton\KryptonListBoxListControl.cs" />
-    <Compile Include="winforms\krypton\KryptonTextControl.cs" />
-    <Compile Include="winforms\krypton\ListboxExtensions.cs" />
-    <Compile Include="winforms\krypton\TextBoxExtensions.cs" />
-    <Compile Include="winforms\resources\ApplicationIcon.cs" />
-    <Compile Include="winforms\resources\ApplicationImage.cs" />
-    <Compile Include="winforms\resources\HybridIcon.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\licenses.licx" />
-    <EmbeddedResource Include="winforms\views\AddCompanyView.resx">
-      <DependentUpon>AddCompanyView.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\AddBillPaymentView.resx">
-      <DependentUpon>AddBillPaymentView.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\ViewAllIncomesReport.resx">
-      <DependentUpon>ViewAllIncomesReport.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\ViewAllBills.resx">
-      <DependentUpon>ViewAllBills.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\ViewAllBillsReport.resx">
-      <DependentUpon>ViewAllBillsReport.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\ApplicationWindow.resx">
-      <DependentUpon>ApplicationWindow.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\SaveChangesView.resx">
-      <DependentUpon>SaveChangesView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\AddNewIncomeView.resx">
-      <DependentUpon>AddNewIncomeView.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\ViewAllIncome.resx">
-      <DependentUpon>ViewAllIncome.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\AboutTheApplicationView.resx">
-      <DependentUpon>AboutTheApplicationView.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\MainMenuView.resx">
-      <DependentUpon>MainMenuView.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\ReportViewer.resx">
-      <DependentUpon>ReportViewer.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\ApplicationShell.resx">
-      <DependentUpon>ApplicationShell.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\LogFileView.resx">
-      <DependentUpon>LogFileView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\UnhandledErrorView.resx">
-      <DependentUpon>UnhandledErrorView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\WelcomeScreen.resx">
-      <DependentUpon>WelcomeScreen.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\SplashScreenView.resx">
-      <DependentUpon>SplashScreenView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="winforms\views\CheckForUpdatesView.resx">
-      <DependentUpon>CheckForUpdatesView.cs</DependentUpon>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\commons\infrastructure\infrastructure.csproj">

@@ -2,8 +2,8 @@ using System;
 using System.Reflection;
 using gorilla.commons.utility;
 using momoney.presentation.presenters;
+using momoney.presentation.resources;
 using momoney.presentation.views;
-using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Winforms.Views
 {

@@ -2,12 +2,12 @@ using System;
 using System.Collections.Generic;
 using gorilla.commons.utility;
 using MoMoney.DTO;
-using momoney.presentation.presenters;
+using momoney.presentation.presenters;
+using momoney.presentation.resources;
 using momoney.presentation.views;
 using MoMoney.Presentation.Winforms.Helpers;
-using MoMoney.Presentation.Winforms.Krypton;
-using MoMoney.Presentation.Winforms.Resources;
-
+using MoMoney.Presentation.Winforms.Krypton;
+
 namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class AddBillPaymentView : ApplicationDockedWindow, IAddBillPaymentView

@@ -5,10 +5,10 @@ using System.Windows.Forms;
 using gorilla.commons.utility;
 using MoMoney.DTO;
 using MoMoney.Presentation.Presenters;
+using momoney.presentation.resources;
 using momoney.presentation.views;
 using MoMoney.Presentation.Views;
 using MoMoney.Presentation.Winforms.Databinding;
-using MoMoney.Presentation.Winforms.Resources;
 using View = System.Windows.Forms.View;
 
 namespace MoMoney.Presentation.Winforms.Views

@@ -2,13 +2,13 @@ using System;
 using System.Collections.Generic;
 using gorilla.commons.utility;
 using MoMoney.DTO;
-using MoMoney.Presentation.Presenters;
+using MoMoney.Presentation.Presenters;
+using momoney.presentation.resources;
 using momoney.presentation.views;
 using MoMoney.Presentation.Views;
 using MoMoney.Presentation.Winforms.Helpers;
-using MoMoney.Presentation.Winforms.Krypton;
-using MoMoney.Presentation.Winforms.Resources;
-
+using MoMoney.Presentation.Winforms.Krypton;
+
 namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class AddNewIncomeView : ApplicationDockedWindow, IAddNewIncomeView

@@ -1,8 +1,8 @@
 using System.Windows.Forms;
 using gorilla.commons.utility;
+using momoney.presentation.resources;
 using MoMoney.Presentation.Views;
 using MoMoney.Presentation.Winforms.Helpers;
-using MoMoney.Presentation.Winforms.Resources;
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace MoMoney.Presentation.Winforms.Views

@@ -1,8 +1,8 @@
-using System.Windows.Forms;
+using System.Windows.Forms;
+using momoney.presentation.resources;
 using momoney.presentation.views;
-using MoMoney.Presentation.Winforms.Helpers;
-using MoMoney.Presentation.Winforms.Resources;
-
+using MoMoney.Presentation.Winforms.Helpers;
+
 namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class ApplicationWindow : Form, IApplicationWindow

@@ -1,26 +1,25 @@
 using System;
 using System.Reflection;
 using System.Windows.Forms;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Utility;
 using momoney.presentation.presenters;
+using momoney.presentation.resources;
 using momoney.presentation.views;
-using MoMoney.Presentation.Winforms.Resources;
 using momoney.service.infrastructure.updating;
 
 namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class CheckForUpdatesView : ApplicationWindow, ICheckForUpdatesView
     {
-        readonly Shell shell;
         ControlAction<EventArgs> update_button;
         ControlAction<EventArgs> dont_update_button;
         ControlAction<EventArgs> cancel_button;
 
-        public CheckForUpdatesView(Shell shell)
+        public CheckForUpdatesView()
         {
             InitializeComponent();
 
-            this.shell = shell;
             ux_image.Image = ApplicationImages.Splash;
             ux_image.SizeMode = PictureBoxSizeMode.StretchImage;
 
@@ -49,7 +48,7 @@ namespace MoMoney.Presentation.Winforms.Views
 
         public void downloaded(Percent percentage_complete)
         {
-            shell.region<ToolStripProgressBar>(
+            Resolve.the<Shell>().region<ToolStripProgressBar>(
                                                   x =>
                                                   {
                                                       while (percentage_complete.is_less_than(x.Value))

@@ -1,6 +1,6 @@
 using momoney.presentation.presenters;
+using momoney.presentation.resources;
 using momoney.presentation.views;
-using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Winforms.Views
 {

@@ -1,8 +1,8 @@
 using momoney.presentation.presenters;
 using MoMoney.Presentation.Presenters;
+using momoney.presentation.resources;
 using MoMoney.Presentation.Views;
 using MoMoney.Presentation.Winforms.Helpers;
-using MoMoney.Presentation.Winforms.Resources;
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace MoMoney.Presentation.Winforms.Views

@@ -6,8 +6,8 @@ using MoMoney.Presentation.Model.Menu.File;
 using MoMoney.Presentation.Model.Menu.Help;
 using MoMoney.Presentation.Model.Menu.window;
 using momoney.presentation.presenters;
+using momoney.presentation.resources;
 using momoney.presentation.views;
-using MoMoney.Presentation.Winforms.Resources;
 using MenuItem = System.Windows.Forms.MenuItem;
 
 namespace MoMoney.Presentation.Winforms.Views