Commit 965d0e9

@@ -0,0 +1,8 @@
+using Gorilla.Commons.Utility.Core;
+
+namespace MoMoney.Modules.Core
+{
+    public interface ILoadPresentationModulesCommand : ICommand
+    {
+    }
+}
\ No newline at end of file

@@ -5,10 +5,6 @@ using MoMoney.Presentation;
 
 namespace MoMoney.Modules.Core
 {
-    public interface ILoadPresentationModulesCommand : ICommand
-    {
-    }
-
     public class LoadPresentationModulesCommand : ILoadPresentationModulesCommand
     {
         readonly IRegistry<IModule> registry;

@@ -1,20 +1,11 @@
 using Gorilla.Commons.Infrastructure.Eventing;
-using MoMoney.Presentation;
 using MoMoney.Presentation.Model.Menu;
 using MoMoney.Presentation.Model.messages;
-using MoMoney.Presentation.Presenters.Commands;
+using MoMoney.Presentation.Presenters;
 using MoMoney.Presentation.Presenters.Menu;
 
 namespace MoMoney.Modules
 {
-    public interface IApplicationMenuModule : IModule,
-                                              IEventSubscriber<NewProjectOpened>,
-                                              IEventSubscriber<ClosingProjectEvent>,
-                                              IEventSubscriber<SavedChangesEvent>,
-                                              IEventSubscriber<UnsavedChangesEvent>
-    {
-    }
-
     public class ApplicationMenuModule : IApplicationMenuModule
     {
         readonly IEventAggregator broker;

@@ -1,5 +1,5 @@
 using MoMoney.Presentation;
-using MoMoney.Presentation.Presenters.Commands;
+using MoMoney.Presentation.Presenters;
 using MoMoney.Presentation.Presenters.Shell;
 
 namespace MoMoney.Modules

@@ -1,13 +1,8 @@
 using Gorilla.Commons.Infrastructure.Eventing;
 using MoMoney.DataAccess;
-using MoMoney.Presentation;
 
 namespace MoMoney.Modules
 {
-    public interface IDatabaseModule : IModule
-    {
-    }
-
     public class DatabaseModule : IDatabaseModule
     {
         readonly IDatabaseConfiguration configuration;

@@ -1,7 +1,7 @@
 using Gorilla.Commons.Infrastructure.Eventing;
 using MoMoney.Presentation;
 using MoMoney.Presentation.Model.messages;
-using MoMoney.Presentation.Presenters.Commands;
+using MoMoney.Presentation.Presenters;
 using MoMoney.Presentation.Presenters.Shell;
 
 namespace MoMoney.Modules

@@ -1,7 +1,7 @@
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Testing;
-using MoMoney.Presentation.Presenters.Commands;
+using MoMoney.Presentation.Presenters;
 
 namespace MoMoney.Modules
 {

@@ -0,0 +1,14 @@
+using Gorilla.Commons.Infrastructure.Eventing;
+using MoMoney.Presentation;
+using MoMoney.Presentation.Model.messages;
+
+namespace MoMoney.Modules
+{
+    public interface IApplicationMenuModule : IModule,
+                                              IEventSubscriber<NewProjectOpened>,
+                                              IEventSubscriber<ClosingProjectEvent>,
+                                              IEventSubscriber<SavedChangesEvent>,
+                                              IEventSubscriber<UnsavedChangesEvent>
+    {
+    }
+}
\ No newline at end of file

@@ -0,0 +1,8 @@
+using MoMoney.Presentation;
+
+namespace MoMoney.Modules
+{
+    public interface IDatabaseModule : IModule
+    {
+    }
+}
\ No newline at end of file

@@ -0,0 +1,10 @@
+using Gorilla.Commons.Infrastructure.Eventing;
+using MoMoney.Presentation;
+using MoMoney.Presentation.Model.messages;
+
+namespace MoMoney.Modules
+{
+    public interface IMainMenuModule : IModule, IEventSubscriber<NewProjectOpened>
+    {
+    }
+}
\ No newline at end of file

@@ -0,0 +1,10 @@
+using Gorilla.Commons.Infrastructure.Eventing;
+using MoMoney.Presentation;
+using MoMoney.Presentation.Model.messages;
+
+namespace MoMoney.Modules
+{
+    public interface INavigationModule : IModule, IEventSubscriber<NewProjectOpened>
+    {
+    }
+}
\ No newline at end of file

@@ -0,0 +1,14 @@
+using Gorilla.Commons.Infrastructure.Eventing;
+using MoMoney.Presentation;
+using MoMoney.Presentation.Model.messages;
+
+namespace MoMoney.Modules
+{
+    public interface IToolbarModule : IModule,
+                                      IEventSubscriber<NewProjectOpened>,
+                                      IEventSubscriber<ClosingProjectEvent>,
+                                      IEventSubscriber<SavedChangesEvent>,
+                                      IEventSubscriber<UnsavedChangesEvent>
+    {
+    }
+}
\ No newline at end of file

@@ -1,15 +1,10 @@
 using Gorilla.Commons.Infrastructure.Eventing;
-using MoMoney.Presentation;
 using MoMoney.Presentation.Model.messages;
-using MoMoney.Presentation.Presenters.Commands;
+using MoMoney.Presentation.Presenters;
 using MoMoney.Presentation.Presenters.Navigation;
 
 namespace MoMoney.Modules
 {
-    public interface IMainMenuModule : IModule, IEventSubscriber<NewProjectOpened>
-    {
-    }
-
     public class MainMenuModule : IMainMenuModule
     {
         readonly IEventAggregator broker;

@@ -1,15 +1,10 @@
 using Gorilla.Commons.Infrastructure.Eventing;
-using MoMoney.Presentation;
 using MoMoney.Presentation.Model.messages;
-using MoMoney.Presentation.Presenters.Commands;
+using MoMoney.Presentation.Presenters;
 using MoMoney.Presentation.Presenters.Navigation;
 
 namespace MoMoney.Modules
 {
-    public interface INavigationModule : IModule, IEventSubscriber<NewProjectOpened>
-    {
-    }
-
     public class NavigationModule : INavigationModule
     {
         readonly IEventAggregator broker;

@@ -1,20 +1,11 @@
 using Gorilla.Commons.Infrastructure.Eventing;
-using MoMoney.Presentation;
 using MoMoney.Presentation.Model.Menu;
 using MoMoney.Presentation.Model.messages;
-using MoMoney.Presentation.Presenters.Commands;
+using MoMoney.Presentation.Presenters;
 using MoMoney.Presentation.Presenters.Shell;
 
 namespace MoMoney.Modules
 {
-    public interface IToolbarModule : IModule,
-                                      IEventSubscriber<NewProjectOpened>,
-                                      IEventSubscriber<ClosingProjectEvent>,
-                                      IEventSubscriber<SavedChangesEvent>,
-                                      IEventSubscriber<UnsavedChangesEvent>
-    {
-    }
-
     public class ToolbarModule : IToolbarModule
     {
         readonly IEventAggregator broker;

@@ -162,8 +162,14 @@
     <Compile Include="boot\global_error_handling.cs" />
     <Compile Include="boot\WindowsFormsApplication.cs" />
     <Compile Include="Modules\ApplicationShellModule.cs" />
+    <Compile Include="Modules\Core\ILoadPresentationModulesCommand.cs" />
     <Compile Include="Modules\DatabaseModule.cs" />
     <Compile Include="Modules\ApplicationMenuModule.cs" />
+    <Compile Include="Modules\IApplicationMenuModule.cs" />
+    <Compile Include="Modules\IDatabaseModule.cs" />
+    <Compile Include="Modules\IMainMenuModule.cs" />
+    <Compile Include="Modules\INavigationModule.cs" />
+    <Compile Include="Modules\IToolbarModule.cs" />
     <Compile Include="Modules\MainMenuModule.cs" />
     <Compile Include="Modules\NavigationModule.cs" />
     <Compile Include="Modules\GettingStartedModule.cs" />

@@ -1,7 +1,7 @@
 using System;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Presentation.Presenters.excel
+namespace MoMoney.Presentation.Model.Excel
 {
     public class Cell
     {

@@ -1,6 +1,4 @@
-using MoMoney.Presentation.Presenters.excel;
-
-namespace MoMoney.Presentation.Presenters.Excel
+namespace MoMoney.Presentation.Model.Excel
 {
     public class ChangeFontSize : ICellVisitor
     {

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace MoMoney.Presentation.Presenters.excel
+namespace MoMoney.Presentation.Model.Excel
 {
     public class CompositeCellVisitor : ICellVisitor
     {

@@ -1,6 +1,6 @@
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Presentation.Presenters.excel
+namespace MoMoney.Presentation.Model.Excel
 {
     public class ConstrainedCellVisitor : ICellVisitor
     {

@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using Gorilla.Commons.Utility.Extensions;
-using MoMoney.Presentation.Presenters.Excel;
 
-namespace MoMoney.Presentation.Presenters.excel
+namespace MoMoney.Presentation.Model.Excel
 {
     public class ExcelUsage
     {

@@ -1,7 +1,6 @@
 using System.Drawing;
-using MoMoney.Presentation.Presenters.excel;
 
-namespace MoMoney.Presentation.Presenters.Excel
+namespace MoMoney.Presentation.Model.Excel
 {
     public class FormatBackColor : ICellVisitor
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Presenters.excel
+namespace MoMoney.Presentation.Model.Excel
 {
     public interface ICell
     {

@@ -1,6 +1,6 @@
 using System.Drawing;
 
-namespace MoMoney.Presentation.Presenters.excel
+namespace MoMoney.Presentation.Model.Excel
 {
     public interface ICellInterior
     {

@@ -1,6 +1,6 @@
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Presentation.Presenters.excel
+namespace MoMoney.Presentation.Model.Excel
 {
     public interface ICellVisitor : IVisitor<ICell>
     {

@@ -1,5 +1,5 @@
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Presentation.Presenters.Commands;
+using MoMoney.Presentation.Presenters;
 using MoMoney.Presentation.Presenters.Menu.Help;
 
 namespace MoMoney.Presentation.Model.Menu.Help.commands

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using MoMoney.Presentation.Model.Menu.Help.commands;
-using MoMoney.Presentation.Presenters.Commands;
+using MoMoney.Presentation.Presenters;
 using MoMoney.Presentation.Presenters.Shell;
 using MoMoney.Presentation.Presenters.updates;
 using MoMoney.Presentation.Resources;

@@ -1,5 +1,5 @@
+using MoMoney.Presentation.Presenters;
 using MoMoney.Presentation.Presenters.billing;
-using MoMoney.Presentation.Presenters.Commands;
 using MoMoney.Presentation.Resources;
 
 namespace MoMoney.Presentation.Model.Navigation

@@ -1,5 +1,4 @@
 using MoMoney.Presentation.Presenters;
-using MoMoney.Presentation.Presenters.Commands;
 using MoMoney.Presentation.Resources;
 
 namespace MoMoney.Presentation.Model.Navigation

@@ -0,0 +1,9 @@
+using System.Windows.Forms;
+using Gorilla.Commons.Utility.Core;
+
+namespace MoMoney.Presentation.Model.Navigation
+{
+    public interface INavigationTreeVisitor : IVisitor<TreeView>
+    {
+    }
+}
\ No newline at end of file

@@ -0,0 +1,13 @@
+using System;
+using Gorilla.Commons.Utility.Core;
+using Gorilla.Commons.Windows.Forms.Resources;
+
+namespace MoMoney.Presentation.Model.Navigation
+{
+    public interface ITreeBranch
+    {
+        void accept(IVisitor<ITreeBranch> visitor);
+        ITreeBranch add_child(string name, ApplicationIcon icon, ICommand command);
+        ITreeBranch add_child(string name, ApplicationIcon icon, Action command);
+    }
+}
\ No newline at end of file

@@ -0,0 +1,9 @@
+using System.Windows.Forms;
+using Gorilla.Commons.Utility.Core;
+
+namespace MoMoney.Presentation.Model.Navigation
+{
+    public interface ITreeViewToRootNodeMapper : IMapper<TreeView, ITreeBranch>
+    {
+    }
+}
\ No newline at end of file

@@ -4,10 +4,6 @@ using Gorilla.Commons.Utility.Extensions;
 
 namespace MoMoney.Presentation.Model.Navigation
 {
-    public interface INavigationTreeVisitor : IVisitor<TreeView>
-    {
-    }
-
     public class NavigationTreeVisitor : INavigationTreeVisitor
     {
         readonly ITreeViewToRootNodeMapper mapper;

@@ -6,13 +6,6 @@ using Gorilla.Commons.Windows.Forms.Resources;
 
 namespace MoMoney.Presentation.Model.Navigation
 {
-    public interface ITreeBranch
-    {
-        void accept(IVisitor<ITreeBranch> visitor);
-        ITreeBranch add_child(string name, ApplicationIcon icon, ICommand command);
-        ITreeBranch add_child(string name, ApplicationIcon icon, Action command);
-    }
-
     public class TreeBranch : ITreeBranch
     {
         readonly TreeNode node;

@@ -3,10 +3,6 @@ using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.Presentation.Model.Navigation
 {
-    public interface ITreeViewToRootNodeMapper : IMapper<TreeView, ITreeBranch>
-    {
-    }
-
     public class TreeViewToRootNodeMapper : ITreeViewToRootNodeMapper
     {
         public ITreeBranch map_from(TreeView item)

@@ -1,5 +1,4 @@
 using MoMoney.Presentation.Presenters.billing;
-using MoMoney.Presentation.Presenters.Commands;
 using MoMoney.Presentation.Resources;
 using XPExplorerBar;
 

@@ -1,4 +1,3 @@
-using MoMoney.Presentation.Presenters.Commands;
 using MoMoney.Presentation.Resources;
 using XPExplorerBar;
 

@@ -1,4 +1,3 @@
-using MoMoney.Presentation.Presenters.Commands;
 using MoMoney.Presentation.Presenters.income;
 using MoMoney.Presentation.Resources;
 using XPExplorerBar;

@@ -1,4 +1,3 @@
-using MoMoney.Presentation.Presenters.Commands;
 using MoMoney.Presentation.Presenters.reporting;
 using MoMoney.Presentation.Resources;
 using XPExplorerBar;

@@ -0,0 +1,9 @@
+using MoMoney.Presentation.Core;
+
+namespace MoMoney.Presentation.Presenters
+{
+    public interface IRunPresenterCommand
+    {
+        void run<Presenter>() where Presenter : IPresenter;
+    }
+}
\ No newline at end of file

@@ -1,13 +1,8 @@
 using Gorilla.Commons.Infrastructure.Threading;
 using MoMoney.Presentation.Core;
 
-namespace MoMoney.Presentation.Presenters.Commands
+namespace MoMoney.Presentation.Presenters
 {
-    public interface IRunPresenterCommand
-    {
-        void run<Presenter>() where Presenter : IPresenter;
-    }
-
     public class RunPresenterCommand : IRunPresenterCommand
     {
         readonly IApplicationController application_controller;

@@ -2,7 +2,7 @@ using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Infrastructure.Logging;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Presentation.Model.Projects;
-using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Views;
 
 namespace MoMoney.Presentation.Presenters.Shell
 {

@@ -3,7 +3,7 @@ using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Testing;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Presentation.Model.Projects;
-using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Views;
 
 namespace MoMoney.Presentation.Presenters.Shell
 {

@@ -1,6 +1,6 @@
 using System;
 
-namespace Gorilla.Commons.Windows.Forms
+namespace MoMoney.Presentation.Views.Core
 {
     public delegate void ControlAction<T>(T input) where T : EventArgs;
 }
\ No newline at end of file

@@ -0,0 +1,16 @@
+using System.Windows.Forms;
+using Gorilla.Commons.Windows.Forms.Resources;
+using MoMoney.Presentation.Views.Core;
+using WeifenLuo.WinFormsUI.Docking;
+
+namespace MoMoney.Presentation.Views.core
+{
+    public interface IApplicationDockedWindow : IWindowEvents, IDockedContentView
+    {
+        IApplicationDockedWindow create_tool_tip_for(string title, string caption, Control control);
+        IApplicationDockedWindow titled(string title, params object[] arguments);
+        IApplicationDockedWindow icon(ApplicationIcon icon);
+        IApplicationDockedWindow cannot_be_closed();
+        IApplicationDockedWindow docked_to(DockState state);
+    }
+}
\ No newline at end of file

@@ -0,0 +1,13 @@
+using System.Windows.Forms;
+using MoMoney.Presentation.Views.Core;
+
+namespace MoMoney.Presentation.Views.core
+{
+    public interface IApplicationWindow : IView
+    {
+        IApplicationWindow titled(string title);
+        IApplicationWindow create_tool_tip_for(string title, string caption, Control control);
+        IApplicationWindow try_to_reduce_flickering();
+        IApplicationWindow top_most();
+    }
+}
\ No newline at end of file

@@ -0,0 +1,9 @@
+using Gorilla.Commons.Infrastructure.FileSystem;
+
+namespace MoMoney.Presentation.Views.dialogs
+{
+    public interface ISelectFileToOpenDialog
+    {
+        IFile tell_me_the_path_to_the_file();
+    }
+}
\ No newline at end of file

@@ -0,0 +1,9 @@
+using Gorilla.Commons.Infrastructure.FileSystem;
+
+namespace MoMoney.Presentation.Views.dialogs
+{
+    public interface ISelectFileToSaveToDialog
+    {
+        IFile tell_me_the_path_to_the_file();
+    }
+}
\ No newline at end of file

@@ -0,0 +1,7 @@
+namespace MoMoney.Presentation.Views.Shell
+{
+    public interface ITaskTrayMessageView
+    {
+        void display(string message, params object[] arguments);
+    }
+}
\ No newline at end of file

@@ -0,0 +1,9 @@
+namespace MoMoney.Presentation.Views
+{
+    public interface ITitleBar
+    {
+        void display(string title);
+        void append_asterik();
+        void remove_asterik();
+    }
+}
\ No newline at end of file

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using MoMoney.DTO;
+using MoMoney.Presentation.Model.reporting;
+
+namespace MoMoney.Presentation.Views.billing
+{
+    public interface IViewAllBillsReport : IReport
+    {
+        void run(IEnumerable<BillInformationDTO> bills);
+    }
+}
\ No newline at end of file

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using Gorilla.Commons.Windows.Forms;
 
 namespace MoMoney.Presentation.Views.Core
 {

@@ -1,7 +1,8 @@
 using System;
 using System.Linq.Expressions;
+using Gorilla.Commons.Windows.Forms.Databinding;
 
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     public interface IBindingSelector<TypeToBindTo>
     {

@@ -2,6 +2,7 @@ using System;
 using System.Linq.Expressions;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
+using MoMoney.Presentation.Winforms.Databinding;
 
 namespace Gorilla.Commons.Windows.Forms.Databinding
 {

@@ -1,6 +1,7 @@
 using System;
 using System.Linq.Expressions;
 using System.Windows.Forms;
+using MoMoney.Presentation.Winforms.Databinding;
 
 namespace Gorilla.Commons.Windows.Forms.Databinding
 {

@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
 using Gorilla.Commons.Utility.Extensions;
-using Gorilla.Commons.Windows.Forms;
 using Gorilla.Commons.Windows.Forms.Helpers;
 using Gorilla.Commons.Windows.Forms.Krypton;
 using MoMoney.DTO;
 using MoMoney.Presentation.Presenters.billing;
 using MoMoney.Presentation.Views.core;
+using MoMoney.Presentation.Views.Core;
 
 namespace MoMoney.Presentation.Views.billing
 {

@@ -3,12 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using Gorilla.Commons.Utility.Extensions;
-using Gorilla.Commons.Windows.Forms;
 using Gorilla.Commons.Windows.Forms.Databinding;
 using MoMoney.DTO;
 using MoMoney.Presentation.Presenters;
 using MoMoney.Presentation.Resources;
 using MoMoney.Presentation.Views.core;
+using MoMoney.Presentation.Views.Core;
 
 namespace MoMoney.Presentation.Views
 {

@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
 using Gorilla.Commons.Utility.Extensions;
-using Gorilla.Commons.Windows.Forms;
 using Gorilla.Commons.Windows.Forms.Helpers;
 using Gorilla.Commons.Windows.Forms.Krypton;
 using MoMoney.DTO;
 using MoMoney.Presentation.Presenters.income;
 using MoMoney.Presentation.Views.core;
+using MoMoney.Presentation.Views.Core;
 
 namespace MoMoney.Presentation.Views.income
 {

@@ -3,7 +3,6 @@ using System.ComponentModel;
 using System.Linq;
 using System.Windows.Forms;
 using Gorilla.Commons.Utility.Extensions;
-using Gorilla.Commons.Windows.Forms;
 using Gorilla.Commons.Windows.Forms.Helpers;
 using Gorilla.Commons.Windows.Forms.Resources;
 using MoMoney.Presentation.Resources;
@@ -12,15 +11,6 @@ using WeifenLuo.WinFormsUI.Docking;
 
 namespace MoMoney.Presentation.Views.core
 {
-    public interface IApplicationDockedWindow : IWindowEvents, IDockedContentView
-    {
-        IApplicationDockedWindow create_tool_tip_for(string title, string caption, Control control);
-        IApplicationDockedWindow titled(string title, params object[] arguments);
-        IApplicationDockedWindow icon(ApplicationIcon icon);
-        IApplicationDockedWindow cannot_be_closed();
-        IApplicationDockedWindow docked_to(DockState state);
-    }
-
     public partial class ApplicationDockedWindow : DockContent, IApplicationDockedWindow
     {
         DockState dock_state;

@@ -4,7 +4,6 @@ using System.ComponentModel;
 using System.ComponentModel.Composition;
 using System.Windows.Forms;
 using Gorilla.Commons.Utility.Extensions;
-using Gorilla.Commons.Windows.Forms;
 using Gorilla.Commons.Windows.Forms.Helpers;
 using MoMoney.Presentation.Presenters.Shell;
 using MoMoney.Presentation.Views.core;

@@ -1,21 +1,12 @@
 using System;
 using System.ComponentModel;
 using System.Windows.Forms;
-using Gorilla.Commons.Windows.Forms;
 using Gorilla.Commons.Windows.Forms.Helpers;
 using MoMoney.Presentation.Resources;
 using MoMoney.Presentation.Views.Core;
 
 namespace MoMoney.Presentation.Views.core
 {
-    public interface IApplicationWindow : IView
-    {
-        IApplicationWindow titled(string title);
-        IApplicationWindow create_tool_tip_for(string title, string caption, Control control);
-        IApplicationWindow try_to_reduce_flickering();
-        IApplicationWindow top_most();
-    }
-
     public partial class ApplicationWindow : Form, IApplicationWindow
     {
         public ApplicationWindow()

@@ -2,11 +2,11 @@ using System;
 using System.Reflection;
 using System.Windows.Forms;
 using Gorilla.Commons.Utility;
-using Gorilla.Commons.Windows.Forms;
 using MoMoney.DTO;
 using MoMoney.Presentation.Presenters.updates;
 using MoMoney.Presentation.Resources;
 using MoMoney.Presentation.Views.core;
+using MoMoney.Presentation.Views.Core;
 using MoMoney.Presentation.Views.Shell;
 
 namespace MoMoney.Presentation.Views.updates

@@ -5,9 +5,10 @@ using MoMoney.Presentation.Model.Menu;
 using MoMoney.Presentation.Model.Menu.File;
 using MoMoney.Presentation.Model.Menu.Help;
 using MoMoney.Presentation.Model.Menu.window;
+using MoMoney.Presentation.Views.Shell;
 using MenuItem=System.Windows.Forms.MenuItem;
 
-namespace MoMoney.Presentation.Views.Shell
+namespace MoMoney.Presentation.Views
 {
     public class NotificationIconView : INotificationIconView
     {

@@ -1,10 +1,10 @@
 using System;
 using System.ComponentModel;
 using System.Windows.Forms;
-using Gorilla.Commons.Windows.Forms;
 using MoMoney.Presentation.Model.Menu.File.Commands;
 using MoMoney.Presentation.Resources;
 using MoMoney.Presentation.Views.core;
+using MoMoney.Presentation.Views.Core;
 
 namespace MoMoney.Presentation.Views.dialogs
 {

@@ -3,11 +3,6 @@ using Gorilla.Commons.Infrastructure.FileSystem;
 
 namespace MoMoney.Presentation.Views.dialogs
 {
-    public interface ISelectFileToOpenDialog
-    {
-        IFile tell_me_the_path_to_the_file();
-    }
-
     public class SelectFileToOpenDialog : ISelectFileToOpenDialog
     {
         readonly IWin32Window window;

@@ -3,11 +3,6 @@ using Gorilla.Commons.Infrastructure.FileSystem;
 
 namespace MoMoney.Presentation.Views.dialogs
 {
-    public interface ISelectFileToSaveToDialog
-    {
-        IFile tell_me_the_path_to_the_file();
-    }
-
     public class SelectFileToSaveToDialog : ISelectFileToSaveToDialog
     {
         readonly FileDialog dialog;

@@ -2,11 +2,6 @@ using Gorilla.Commons.Utility.Extensions;
 
 namespace MoMoney.Presentation.Views.Shell
 {
-    public interface ITaskTrayMessageView
-    {
-        void display(string message, params object[] arguments);
-    }
-
     public class TaskTrayMessage : ITaskTrayMessageView
     {
         readonly INotificationIconView view;

@@ -1,14 +1,8 @@
 using System.Windows.Forms;
+using MoMoney.Presentation.Views.Shell;
 
-namespace MoMoney.Presentation.Views.Shell
+namespace MoMoney.Presentation.Views
 {
-    public interface ITitleBar
-    {
-        void display(string title);
-        void append_asterik();
-        void remove_asterik();
-    }
-
     public class TitleBar : ITitleBar
     {
         readonly IRegionManager shell;

@@ -1,9 +1,9 @@
 using System;
 using System.Windows.Forms;
-using Gorilla.Commons.Windows.Forms;
 using MoMoney.Presentation.Presenters.Shell;
 using MoMoney.Presentation.Resources;
 using MoMoney.Presentation.Views.core;
+using MoMoney.Presentation.Views.Core;
 
 namespace MoMoney.Presentation.Views.Shell
 {

@@ -7,11 +7,6 @@ using MoMoney.Presentation.Model.reporting;
 
 namespace MoMoney.Presentation.Views.billing
 {
-    public interface IViewAllBillsReport : IReport
-    {
-        void run(IEnumerable<BillInformationDTO> bills);
-    }
-
     public partial class ViewAllBillsReport : ActiveReport, IViewAllBillsReport
     {
         public ViewAllBillsReport()

@@ -111,8 +111,11 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Presenters\Commands\CommandFactory.cs" />
-    <Compile Include="Presenters\Commands\CommandPump.cs" />
+    <Compile Include="Model\Navigation\INavigationTreeVisitor.cs" />
+    <Compile Include="Model\Navigation\ITreeBranch.cs" />
+    <Compile Include="Model\Navigation\ITreeViewToRootNodeMapper.cs" />
+    <Compile Include="Presenters\CommandFactory.cs" />
+    <Compile Include="Presenters\CommandPump.cs" />
     <Compile Include="Core\ApplicationController.cs" />
     <Compile Include="Core\ApplicationControllerSpecs.cs" />
     <Compile Include="Core\ApplicationEnvironment.cs" />
@@ -178,212 +181,220 @@
     <Compile Include="Model\Reporting\ReportBindingExtensionsSpecs.cs" />
     <Compile Include="Presenters\AddCompanyPresenter.cs" />
     <Compile Include="Presenters\AddCompanyPresenterSpecs.cs" />
-    <Compile Include="Presenters\Billing\AddBillPaymentPresenter.cs" />
-    <Compile Include="Presenters\Billing\ViewAllBillsPresenter.cs" />
-    <Compile Include="Presenters\Commands\RestartCommand.cs" />
-    <Compile Include="Presenters\Commands\RunPresenterCommand.cs" />
-    <Compile Include="Presenters\Commands\RunThe.cs" />
-    <Compile Include="Presenters\Commands\RunTheSpecs.cs" />
-    <Compile Include="Presenters\Excel\Cell.cs" />
-    <Compile Include="Presenters\Excel\ChangeFontSize.cs" />
-    <Compile Include="Presenters\Excel\CompositeCellVisitor.cs" />
-    <Compile Include="Presenters\Excel\ConstrainedCellVisitor.cs" />
-    <Compile Include="Presenters\Excel\ExcelUsage.cs" />
-    <Compile Include="Presenters\Excel\FormatBackColor.cs" />
-    <Compile Include="Presenters\Excel\ICell.cs" />
-    <Compile Include="Presenters\Excel\ICellInterior.cs" />
-    <Compile Include="Presenters\Excel\ICellVisitor.cs" />
-    <Compile Include="Presenters\Income\AddNewIncomePresenter.cs" />
-    <Compile Include="Presenters\Income\AddNewIncomePresenterSpecs.cs" />
-    <Compile Include="Presenters\Income\ViewIncomeHistoryPresenter.cs" />
-    <Compile Include="Presenters\Menu\AboutTheApplicationPresenter.cs" />
-    <Compile Include="Presenters\Menu\ApplicationMenuPresenter.cs" />
-    <Compile Include="Presenters\Navigation\AddBillingTaskPane.cs" />
-    <Compile Include="Presenters\Navigation\AddCompanyTaskPane.cs" />
-    <Compile Include="Presenters\Navigation\AddIncomeTaskPane.cs" />
-    <Compile Include="Presenters\Navigation\AddReportingTaskPane.cs" />
-    <Compile Include="Presenters\Navigation\Build.cs" />
-    <Compile Include="Presenters\Navigation\ExpandoBuilder.cs" />
-    <Compile Include="Presenters\Navigation\ExpandoItemBuilder.cs" />
-    <Compile Include="Presenters\Navigation\IActionTaskPaneFactory.cs" />
-    <Compile Include="Presenters\Navigation\MainMenuPresenter.cs" />
-    <Compile Include="Presenters\Navigation\NavigationPresenter.cs" />
-    <Compile Include="Presenters\Navigation\NavigationPresenterSpecs.cs" />
-    <Compile Include="Presenters\Reporting\ReportPresenter.cs" />
-    <Compile Include="Presenters\Shell\ApplicationShellPresenter.cs" />
-    <Compile Include="Presenters\Shell\GettingStartedPresenter.cs" />
-    <Compile Include="Presenters\Shell\GettingStartedPresenterSpecs.cs" />
-    <Compile Include="Presenters\Shell\LogFilePresenter.cs" />
-    <Compile Include="Presenters\Shell\LogFileViewPresenterSpecs.cs" />
-    <Compile Include="Presenters\Shell\NotificationIconPresenter.cs" />
-    <Compile Include="Presenters\Shell\NotificationIconPresenterSpecs.cs" />
-    <Compile Include="Presenters\Shell\NotificationPresenter.cs" />
-    <Compile Include="Presenters\Shell\StatusBarPresenter.cs" />
-    <Compile Include="Presenters\Shell\StatusBarPresenterSpecs.cs" />
-    <Compile Include="Presenters\Shell\TaskTrayPresenter.cs" />
-    <Compile Include="Presenters\Shell\TitleBarPresenter.cs" />
-    <Compile Include="Presenters\Shell\TitleBarPresenterSpecs.cs" />
-    <Compile Include="Presenters\Shell\ToolBarPresenter.cs" />
-    <Compile Include="Presenters\Shell\UnhandledErrorPresenter.cs" />
-    <Compile Include="Presenters\Shell\UnhandledErrorPresenterSpecs.cs" />
-    <Compile Include="Presenters\Startup\display_the_splash_screen.cs" />
-    <Compile Include="Presenters\Startup\hide_the_splash_screen.cs" />
-    <Compile Include="Presenters\Startup\ISplashScreenState.cs" />
-    <Compile Include="Presenters\Startup\SplashScreenPresenter.cs" />
-    <Compile Include="Presenters\Startup\SplashScreenPresenterSpecs.cs" />
-    <Compile Include="Presenters\Updates\CheckForUpdatesPresenter.cs" />
-    <Compile Include="Presenters\Updates\CheckForUpdatesPresenterSpecs.cs" />
-    <Compile Include="Presenters\Commands\ProcessQueryCommand.cs" />
+    <Compile Include="Presenters\AddBillPaymentPresenter.cs" />
+    <Compile Include="Presenters\IRunPresenterCommand.cs" />
+    <Compile Include="Presenters\ViewAllBillsPresenter.cs" />
+    <Compile Include="Presenters\RestartCommand.cs" />
+    <Compile Include="Presenters\RunPresenterCommand.cs" />
+    <Compile Include="Presenters\RunThe.cs" />
+    <Compile Include="Presenters\RunTheSpecs.cs" />
+    <Compile Include="Model\Excel\Cell.cs" />
+    <Compile Include="Model\Excel\ChangeFontSize.cs" />
+    <Compile Include="Model\Excel\CompositeCellVisitor.cs" />
+    <Compile Include="Model\Excel\ConstrainedCellVisitor.cs" />
+    <Compile Include="Model\Excel\ExcelUsage.cs" />
+    <Compile Include="Model\Excel\FormatBackColor.cs" />
+    <Compile Include="Model\Excel\ICell.cs" />
+    <Compile Include="Model\Excel\ICellInterior.cs" />
+    <Compile Include="Model\Excel\ICellVisitor.cs" />
+    <Compile Include="Presenters\AddNewIncomePresenter.cs" />
+    <Compile Include="Presenters\AddNewIncomePresenterSpecs.cs" />
+    <Compile Include="Presenters\ViewIncomeHistoryPresenter.cs" />
+    <Compile Include="Presenters\AboutTheApplicationPresenter.cs" />
+    <Compile Include="Presenters\ApplicationMenuPresenter.cs" />
+    <Compile Include="Presenters\AddBillingTaskPane.cs" />
+    <Compile Include="Presenters\AddCompanyTaskPane.cs" />
+    <Compile Include="Presenters\AddIncomeTaskPane.cs" />
+    <Compile Include="Presenters\AddReportingTaskPane.cs" />
+    <Compile Include="Presenters\Build.cs" />
+    <Compile Include="Presenters\ExpandoBuilder.cs" />
+    <Compile Include="Presenters\ExpandoItemBuilder.cs" />
+    <Compile Include="Presenters\IActionTaskPaneFactory.cs" />
+    <Compile Include="Presenters\MainMenuPresenter.cs" />
+    <Compile Include="Presenters\NavigationPresenter.cs" />
+    <Compile Include="Presenters\NavigationPresenterSpecs.cs" />
+    <Compile Include="Presenters\ReportPresenter.cs" />
+    <Compile Include="Presenters\ApplicationShellPresenter.cs" />
+    <Compile Include="Presenters\GettingStartedPresenter.cs" />
+    <Compile Include="Presenters\GettingStartedPresenterSpecs.cs" />
+    <Compile Include="Presenters\LogFilePresenter.cs" />
+    <Compile Include="Presenters\LogFileViewPresenterSpecs.cs" />
+    <Compile Include="Presenters\NotificationIconPresenter.cs" />
+    <Compile Include="Presenters\NotificationIconPresenterSpecs.cs" />
+    <Compile Include="Presenters\NotificationPresenter.cs" />
+    <Compile Include="Presenters\StatusBarPresenter.cs" />
+    <Compile Include="Presenters\StatusBarPresenterSpecs.cs" />
+    <Compile Include="Presenters\TaskTrayPresenter.cs" />
+    <Compile Include="Presenters\TitleBarPresenter.cs" />
+    <Compile Include="Presenters\TitleBarPresenterSpecs.cs" />
+    <Compile Include="Presenters\ToolBarPresenter.cs" />
+    <Compile Include="Presenters\UnhandledErrorPresenter.cs" />
+    <Compile Include="Presenters\UnhandledErrorPresenterSpecs.cs" />
+    <Compile Include="Presenters\display_the_splash_screen.cs" />
+    <Compile Include="Presenters\hide_the_splash_screen.cs" />
+    <Compile Include="Presenters\ISplashScreenState.cs" />
+    <Compile Include="Presenters\SplashScreenPresenter.cs" />
+    <Compile Include="Presenters\SplashScreenPresenterSpecs.cs" />
+    <Compile Include="Presenters\CheckForUpdatesPresenter.cs" />
+    <Compile Include="Presenters\CheckForUpdatesPresenterSpecs.cs" />
+    <Compile Include="Presenters\ProcessQueryCommand.cs" />
+    <Compile Include="Views\ISelectFileToOpenDialog.cs" />
+    <Compile Include="Views\ISelectFileToSaveToDialog.cs" />
+    <Compile Include="Views\ITaskTrayMessageView.cs" />
+    <Compile Include="Views\ITitleBar.cs" />
+    <Compile Include="Views\IViewAllBillsReport.cs" />
+    <Compile Include="Views\IApplicationDockedWindow.cs" />
+    <Compile Include="Views\IApplicationWindow.cs" />
     <Compile Include="Winforms\Resources\ApplicationIcons.cs" />
     <Compile Include="Winforms\Resources\ApplicationImages.cs" />
-    <Compile Include="Presenters\Commands\RunQueryCommand.cs" />
-    <Compile Include="Views\AddCompanyView.cs">
+    <Compile Include="Presenters\RunQueryCommand.cs" />
+    <Compile Include="Winforms\Views\AddCompanyView.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\AddCompanyView.Designer.cs">
+    <Compile Include="Winforms\Views\AddCompanyView.Designer.cs">
       <DependentUpon>AddCompanyView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Billing\AddBillPaymentView.cs">
+    <Compile Include="Winforms\Views\AddBillPaymentView.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\Billing\AddBillPaymentView.Designer.cs">
+    <Compile Include="Winforms\Views\AddBillPaymentView.Designer.cs">
       <DependentUpon>AddBillPaymentView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Billing\IAddBillPaymentView.cs" />
-    <Compile Include="Views\Billing\IViewAllBills.cs" />
-    <Compile Include="Views\Billing\ViewAllBills.cs">
+    <Compile Include="Views\IAddBillPaymentView.cs" />
+    <Compile Include="Views\IViewAllBills.cs" />
+    <Compile Include="Winforms\Views\ViewAllBills.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\Billing\ViewAllBills.Designer.cs">
+    <Compile Include="Winforms\Views\ViewAllBills.Designer.cs">
       <DependentUpon>ViewAllBills.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Billing\ViewAllBillsReport.cs">
+    <Compile Include="Winforms\Views\ViewAllBillsReport.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Views\Billing\ViewAllBillsReport.Designer.cs">
+    <Compile Include="Winforms\Views\ViewAllBillsReport.Designer.cs">
       <DependentUpon>ViewAllBillsReport.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Core\ApplicationDockedWindow.cs">
+    <Compile Include="Winforms\Views\ApplicationDockedWindow.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\Core\ApplicationDockedWindow.Designer.cs">
+    <Compile Include="Winforms\Views\ApplicationDockedWindow.Designer.cs">
       <DependentUpon>ApplicationDockedWindow.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Core\ApplicationWindow.cs">
+    <Compile Include="Winforms\Views\ApplicationWindow.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\Core\ApplicationWindow.Designer.cs">
+    <Compile Include="Winforms\Views\ApplicationWindow.Designer.cs">
       <DependentUpon>ApplicationWindow.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Core\ControlAction.cs" />
-    <Compile Include="Views\Core\ICommandDialog.cs" />
-    <Compile Include="Views\Core\IDialogLauncher.cs" />
-    <Compile Include="Views\Core\IDockedContentView.cs" />
-    <Compile Include="Views\Core\IView.cs" />
-    <Compile Include="Views\Core\IWindowEvents.cs" />
-    <Compile Include="Views\Dialogs\ISaveChangesView.cs" />
-    <Compile Include="Views\Dialogs\SaveChangesView.cs">
+    <Compile Include="Views\ControlAction.cs" />
+    <Compile Include="Views\ICommandDialog.cs" />
+    <Compile Include="Views\IDialogLauncher.cs" />
+    <Compile Include="Views\IDockedContentView.cs" />
+    <Compile Include="Views\IView.cs" />
+    <Compile Include="Views\IWindowEvents.cs" />
+    <Compile Include="Views\ISaveChangesView.cs" />
+    <Compile Include="Winforms\Views\SaveChangesView.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\Dialogs\SaveChangesView.Designer.cs">
+    <Compile Include="Winforms\Views\SaveChangesView.Designer.cs">
       <DependentUpon>SaveChangesView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Dialogs\SaveChangesViewSpecs.cs" />
-    <Compile Include="Views\Dialogs\SelectFileToOpenDialog.cs" />
-    <Compile Include="Views\Dialogs\SelectFileToSaveToDialog.cs" />
+    <Compile Include="Winforms\Views\SaveChangesViewSpecs.cs" />
+    <Compile Include="Winforms\Views\SelectFileToOpenDialog.cs" />
+    <Compile Include="Winforms\Views\SelectFileToSaveToDialog.cs" />
     <Compile Include="Views\IAddCompanyView.cs" />
-    <Compile Include="Views\Income\AddNewIncomeView.cs">
+    <Compile Include="Winforms\Views\AddNewIncomeView.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\Income\AddNewIncomeView.Designer.cs">
+    <Compile Include="Winforms\Views\AddNewIncomeView.Designer.cs">
       <DependentUpon>AddNewIncomeView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Income\IAddNewIncomeView.cs" />
-    <Compile Include="Views\Income\IViewIncomeHistory.cs" />
-    <Compile Include="Views\Income\ViewAllIncome.cs">
+    <Compile Include="Views\IAddNewIncomeView.cs" />
+    <Compile Include="Views\IViewIncomeHistory.cs" />
+    <Compile Include="Winforms\Views\ViewAllIncome.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\Income\ViewAllIncome.Designer.cs">
+    <Compile Include="Winforms\Views\ViewAllIncome.Designer.cs">
       <DependentUpon>ViewAllIncome.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Menu\AboutTheApplicationView.cs">
+    <Compile Include="Winforms\Views\AboutTheApplicationView.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\Menu\AboutTheApplicationView.Designer.cs">
+    <Compile Include="Winforms\Views\AboutTheApplicationView.Designer.cs">
       <DependentUpon>AboutTheApplicationView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Menu\IAboutApplicationView.cs" />
-    <Compile Include="Views\Navigation\IMainMenuView.cs" />
-    <Compile Include="Views\Navigation\INavigationView.cs" />
-    <Compile Include="Views\Navigation\MainMenuView.cs">
+    <Compile Include="Views\IAboutApplicationView.cs" />
+    <Compile Include="Views\IMainMenuView.cs" />
+    <Compile Include="Views\INavigationView.cs" />
+    <Compile Include="Winforms\Views\MainMenuView.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\Navigation\MainMenuView.Designer.cs">
+    <Compile Include="Winforms\Views\MainMenuView.Designer.cs">
       <DependentUpon>MainMenuView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Navigation\NavigationView.cs">
+    <Compile Include="Winforms\Views\NavigationView.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\Navigation\NavigationView.Designer.cs">
+    <Compile Include="Winforms\Views\NavigationView.Designer.cs">
       <DependentUpon>NavigationView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Reporting\IReportViewer.cs" />
-    <Compile Include="Views\Reporting\ReportViewer.cs">
+    <Compile Include="Views\IReportViewer.cs" />
+    <Compile Include="Winforms\Views\ReportViewer.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\Reporting\ReportViewer.Designer.cs">
+    <Compile Include="Winforms\Views\ReportViewer.Designer.cs">
       <DependentUpon>ReportViewer.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Shell\ApplicationShell.cs">
+    <Compile Include="Winforms\Views\ApplicationShell.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\Shell\ApplicationShell.Designer.cs">
+    <Compile Include="Winforms\Views\ApplicationShell.Designer.cs">
       <DependentUpon>ApplicationShell.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Shell\ApplicationShellSpecs.cs" />
-    <Compile Include="Views\Shell\IGettingStartedView.cs" />
-    <Compile Include="Views\Shell\ILogFileView.cs" />
-    <Compile Include="Views\Shell\INotificationIconView.cs" />
-    <Compile Include="Views\Shell\IRegionManager.cs" />
-    <Compile Include="Views\Shell\IShell.cs" />
-    <Compile Include="Views\Shell\IStatusBarView.cs" />
-    <Compile Include="Views\Shell\IUnhandledErrorView.cs" />
-    <Compile Include="Views\Shell\LogFileView.cs">
+    <Compile Include="Views\ApplicationShellSpecs.cs" />
+    <Compile Include="Views\IGettingStartedView.cs" />
+    <Compile Include="Views\ILogFileView.cs" />
+    <Compile Include="Views\INotificationIconView.cs" />
+    <Compile Include="Views\IRegionManager.cs" />
+    <Compile Include="Views\IShell.cs" />
+    <Compile Include="Views\IStatusBarView.cs" />
+    <Compile Include="Views\IUnhandledErrorView.cs" />
+    <Compile Include="Winforms\Views\LogFileView.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\Shell\LogFileView.Designer.cs">
+    <Compile Include="Winforms\Views\LogFileView.Designer.cs">
       <DependentUpon>LogFileView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Shell\NotificationIconView.cs" />
-    <Compile Include="Views\Shell\StatusBarView.cs" />
-    <Compile Include="Views\Shell\TaskTrayMessage.cs" />
-    <Compile Include="Views\Shell\TitleBar.cs" />
-    <Compile Include="Views\Shell\UnhandledErrorView.cs">
+    <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="Views\Shell\UnhandledErrorView.Designer.cs">
+    <Compile Include="Winforms\Views\UnhandledErrorView.Designer.cs">
       <DependentUpon>UnhandledErrorView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Shell\WelcomeScreen.cs">
+    <Compile Include="Winforms\Views\WelcomeScreen.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\Shell\WelcomeScreen.Designer.cs">
+    <Compile Include="Winforms\Views\WelcomeScreen.Designer.cs">
       <DependentUpon>WelcomeScreen.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Startup\ISplashScreenView.cs" />
-    <Compile Include="Views\Startup\SplashScreenView.cs">
+    <Compile Include="Views\ISplashScreenView.cs" />
+    <Compile Include="Winforms\Views\SplashScreenView.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\Startup\SplashScreenView.Designer.cs">
+    <Compile Include="Winforms\Views\SplashScreenView.Designer.cs">
       <DependentUpon>SplashScreenView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Updates\CheckForUpdatesView.cs">
+    <Compile Include="Winforms\Views\CheckForUpdatesView.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Views\Updates\CheckForUpdatesView.Designer.cs">
+    <Compile Include="Winforms\Views\CheckForUpdatesView.Designer.cs">
       <DependentUpon>CheckForUpdatesView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Views\Updates\ICheckForUpdatesView.cs" />
+    <Compile Include="Views\ICheckForUpdatesView.cs" />
     <Compile Include="Winforms\Databinding\BindingSelector.cs" />
     <Compile Include="Winforms\Databinding\BindingSelectorSpecs.cs" />
     <Compile Include="Winforms\Databinding\ComboBoxDataBindingSpecs.cs" />
@@ -448,69 +459,69 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\licenses.licx" />
-    <EmbeddedResource Include="Views\AddCompanyView.resx">
+    <EmbeddedResource Include="Winforms\Views\AddCompanyView.resx">
       <DependentUpon>AddCompanyView.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Billing\AddBillPaymentView.resx">
+    <EmbeddedResource Include="Winforms\Views\AddBillPaymentView.resx">
       <DependentUpon>AddBillPaymentView.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Billing\ViewAllBills.resx">
+    <EmbeddedResource Include="Winforms\Views\ViewAllBills.resx">
       <DependentUpon>ViewAllBills.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Billing\ViewAllBillsReport.resx">
+    <EmbeddedResource Include="Winforms\Views\ViewAllBillsReport.resx">
       <DependentUpon>ViewAllBillsReport.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Core\ApplicationWindow.resx">
+    <EmbeddedResource Include="Winforms\Views\ApplicationWindow.resx">
       <DependentUpon>ApplicationWindow.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Dialogs\SaveChangesView.resx">
+    <EmbeddedResource Include="Winforms\Views\SaveChangesView.resx">
       <DependentUpon>SaveChangesView.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Income\AddNewIncomeView.resx">
+    <EmbeddedResource Include="Winforms\Views\AddNewIncomeView.resx">
       <DependentUpon>AddNewIncomeView.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Income\ViewAllIncome.resx">
+    <EmbeddedResource Include="Winforms\Views\ViewAllIncome.resx">
       <DependentUpon>ViewAllIncome.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Menu\AboutTheApplicationView.resx">
+    <EmbeddedResource Include="Winforms\Views\AboutTheApplicationView.resx">
       <DependentUpon>AboutTheApplicationView.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Navigation\MainMenuView.resx">
+    <EmbeddedResource Include="Winforms\Views\MainMenuView.resx">
       <DependentUpon>MainMenuView.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Navigation\NavigationView.resx">
+    <EmbeddedResource Include="Winforms\Views\NavigationView.resx">
       <DependentUpon>NavigationView.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Reporting\ReportViewer.resx">
+    <EmbeddedResource Include="Winforms\Views\ReportViewer.resx">
       <DependentUpon>ReportViewer.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Shell\ApplicationShell.resx">
+    <EmbeddedResource Include="Winforms\Views\ApplicationShell.resx">
       <DependentUpon>ApplicationShell.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Shell\LogFileView.resx">
+    <EmbeddedResource Include="Winforms\Views\LogFileView.resx">
       <DependentUpon>LogFileView.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Shell\UnhandledErrorView.resx">
+    <EmbeddedResource Include="Winforms\Views\UnhandledErrorView.resx">
       <DependentUpon>UnhandledErrorView.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Shell\WelcomeScreen.resx">
+    <EmbeddedResource Include="Winforms\Views\WelcomeScreen.resx">
       <DependentUpon>WelcomeScreen.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Startup\SplashScreenView.resx">
+    <EmbeddedResource Include="Winforms\Views\SplashScreenView.resx">
       <DependentUpon>SplashScreenView.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\Updates\CheckForUpdatesView.resx">
+    <EmbeddedResource Include="Winforms\Views\CheckForUpdatesView.resx">
       <DependentUpon>CheckForUpdatesView.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
@@ -524,18 +535,6 @@
       <Name>Service.Contracts</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Winforms\Views\Billing\" />
-    <Folder Include="Winforms\Views\Core\" />
-    <Folder Include="Winforms\Views\Dialogs\" />
-    <Folder Include="Winforms\Views\Income\" />
-    <Folder Include="Winforms\Views\Menu\" />
-    <Folder Include="Winforms\Views\Navigation\" />
-    <Folder Include="Winforms\Views\Reporting\" />
-    <Folder Include="Winforms\Views\Shell\" />
-    <Folder Include="Winforms\Views\Startup\" />
-    <Folder Include="Winforms\Views\Updates\" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

@@ -3,11 +3,6 @@ using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.Service.Application
 {
-    public interface IEventLog
-    {
-        void process(ICommand the_event);
-    }
-
     public class EventLog : IEventLog
     {
         readonly IList<ICommand> events = new List<ICommand>();

@@ -0,0 +1,9 @@
+using Gorilla.Commons.Utility.Core;
+
+namespace MoMoney.Service.Application
+{
+    public interface IEventLog
+    {
+        void process(ICommand the_event);
+    }
+}
\ No newline at end of file

@@ -83,6 +83,7 @@
     <Compile Include="Application\GetAllBillsQuery.cs" />
     <Compile Include="Application\GetAllCompanysQuery.cs" />
     <Compile Include="Application\GetAllIncomeQuery.cs" />
+    <Compile Include="Application\IEventLog.cs" />
     <Compile Include="Application\RegisterNewCompanyCommand.cs" />
     <Compile Include="Application\SaveNewBillCommand.cs" />
     <Compile Include="Infrastructure\Logging\LogFileTasks.cs" />
@@ -123,7 +124,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Domain\" />
-    <Folder Include="Infrastructure\Core\" />
     <Folder Include="Properties\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />