Commit 7395740

@@ -4,7 +4,7 @@ namespace MoMoney.boot.container.registration.mapping
 {
     public class DelegateTargetAction<Destination, Value> : ITargetAction<Destination, Value>
     {
-        private readonly Action<Destination, Value> action;
+        readonly Action<Destination, Value> action;
 
         public DelegateTargetAction(Action<Destination, Value> action)
         {

@@ -5,8 +5,8 @@ namespace MoMoney.boot.container.registration.mapping
 {
     public class ExpressionSourceEvaluator<Input, Result> : ISourceEvaluator<Input, Result>
     {
-        private readonly Expression<Func<Input, Result>> original_expression;
-        private Func<Input, Result> evaluator_expression;
+        readonly Expression<Func<Input, Result>> original_expression;
+        Func<Input, Result> evaluator_expression;
 
         public ExpressionSourceEvaluator(Expression<Func<Input, Result>> original_expression)
         {
@@ -19,7 +19,7 @@ namespace MoMoney.boot.container.registration.mapping
             return evaluator_expression(input);
         }
 
-        private void initialize_evaluator()
+        void initialize_evaluator()
         {
             if (evaluator_expression != null) return;
             evaluator_expression = original_expression.Compile();

@@ -4,7 +4,7 @@ namespace MoMoney.boot.container.registration.mapping
 {
     public class FuncInitializationStep<Destination> : IMapInitializationStep<Destination>
     {
-        private readonly Func<Destination> func;
+        readonly Func<Destination> func;
 
         public FuncInitializationStep(Func<Destination> func)
         {

@@ -7,9 +7,9 @@ namespace MoMoney.boot.container.registration.mapping
 {
     public class Map<Input, Output> : IMap<Input, Output>
     {
-        private IMapInitializationStep<Output> map_initialization_step;
-        private readonly IList<IMappingStep<Input, Output>> mapping_steps;
-        private readonly IMappingStepFactory mapping_step_factory;
+        IMapInitializationStep<Output> map_initialization_step;
+        readonly IList<IMappingStep<Input, Output>> mapping_steps;
+        readonly IMappingStepFactory mapping_step_factory;
 
         public Map() : this(new MappingStepFactory())
         {

@@ -2,8 +2,8 @@ namespace MoMoney.boot.container.registration.mapping
 {
     public class MappingStep<Input, Output, Type> : IMappingStep<Input, Output>
     {
-        private readonly ISourceEvaluator<Input, Type> input_evaluator;
-        private readonly ITargetAction<Output, Type> action_to_run_against_destination;
+        readonly ISourceEvaluator<Input, Type> input_evaluator;
+        readonly ITargetAction<Output, Type> action_to_run_against_destination;
 
         public MappingStep(ISourceEvaluator<Input, Type> source_evaluator, ITargetAction<Output, Type> target_action)
         {

@@ -5,7 +5,7 @@ namespace MoMoney.boot.container.registration.mapping
 {
     public class MappingStepFactory : IMappingStepFactory
     {
-        private readonly ITargetActionFactory target_action_factory;
+        readonly ITargetActionFactory target_action_factory;
 
         public MappingStepFactory() : this(new TargetActionFactory())
         {

@@ -9,8 +9,8 @@ namespace MoMoney.boot.container.registration.mapping
 {
     public class PropertyResolver : IPropertyResolver
     {
-        private BindingFlags flags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic |
-                                     BindingFlags.FlattenHierarchy;
+        BindingFlags flags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic |
+                             BindingFlags.FlattenHierarchy;
 
         public PropertyInfo resolve_using<Input, PropertyType>(Expression<Func<Input, PropertyType>> expression)
         {
@@ -49,7 +49,7 @@ namespace MoMoney.boot.container.registration.mapping
             return all_properties_belonging_to(typeof (T));
         }
 
-        private PropertyInfo[] all_properties_for(Type type)
+        PropertyInfo[] all_properties_for(Type type)
         {
             return type.GetProperties(flags);
         }

@@ -5,7 +5,7 @@ namespace MoMoney.boot.container.registration.mapping
 {
     public class TargetActionFactory : ITargetActionFactory
     {
-        private readonly IPropertyResolver property_resolver;
+        readonly IPropertyResolver property_resolver;
 
         public TargetActionFactory(IPropertyResolver property_resolver)
         {

@@ -3,7 +3,7 @@ using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {
-    internal class NoConfiguration<T> : IConfiguration<IProxyBuilder<T>>
+    class NoConfiguration<T> : IConfiguration<IProxyBuilder<T>>
     {
         public void configure(IProxyBuilder<T> item)
         {

@@ -12,7 +12,7 @@ namespace MoMoney.boot.container.registration.proxy_configuration
     }
 
     public class when_attempting_to_perform_an_action_that_requires_authentication :
-        concerns_for< SecuringProxy>
+        concerns_for<SecuringProxy>
     {
         context c = () => { filter = the_dependency<ISpecification<IPrincipal>>(); };
 

@@ -1,13 +1,10 @@
-using System.Security.Principal;
 using Gorilla.Commons.Infrastructure;
 using Gorilla.Commons.Infrastructure.Castle.DynamicProxy;
 using Gorilla.Commons.Utility.Core;
-using Gorilla.Commons.Utility.Extensions;
-using MoMoney.Service.Infrastructure.Security;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {
-    internal class ServiceLayerConfiguration<T> : IConfiguration<IProxyBuilder<T>>
+    class ServiceLayerConfiguration<T> : IConfiguration<IProxyBuilder<T>>
     {
         public void configure(IProxyBuilder<T> item)
         {

@@ -4,7 +4,7 @@ using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {
-    internal class SynchronizedConfiguration<T> : IConfiguration<IProxyBuilder<T>>
+    class SynchronizedConfiguration<T> : IConfiguration<IProxyBuilder<T>>
     {
         public void configure(IProxyBuilder<T> item)
         {

@@ -23,8 +23,8 @@ namespace MoMoney.boot.container.registration
             return new auto_wire_components_in_to_the(builder, exclusions_criteria);
         }
 
-        protected static IDependencyRegistration builder;
-        protected static IComponentExclusionSpecification exclusions_criteria;
+        static protected IDependencyRegistration builder;
+        static protected IComponentExclusionSpecification exclusions_criteria;
     }
 
     public class when_registering_all_the_components_from_an_assembly :

@@ -6,7 +6,7 @@ using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.boot.container.registration
 {
-    internal class wire_up_the_essential_services_into_the : ICommand
+    class wire_up_the_essential_services_into_the : ICommand
     {
         readonly IDependencyRegistration registration;
 

@@ -2,7 +2,6 @@ using System.Collections;
 using System.ComponentModel;
 using System.Deployment.Application;
 using Gorilla.Commons.Infrastructure;
-using Gorilla.Commons.Infrastructure.Castle.DynamicProxy.Interceptors;
 using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Infrastructure.Registries;
 using Gorilla.Commons.Infrastructure.Threading;
@@ -15,7 +14,7 @@ using MoMoney.Tasks.infrastructure.updating;
 
 namespace MoMoney.boot.container.registration
 {
-    internal class wire_up_the_infrastructure_in_to_the : ICommand
+    class wire_up_the_infrastructure_in_to_the : ICommand
     {
         readonly IDependencyRegistration registry;
 
@@ -33,7 +32,7 @@ namespace MoMoney.boot.container.registration
             registry.transient(typeof (ITrackerEntryMapper<>), typeof (TrackerEntryMapper<>));
             registry.transient(typeof (IKey<>), typeof (TypedKey<>));
             registry.transient(typeof (IComponentFactory<>), typeof (ComponentFactory<>));
-            registry.singleton<IContext>( ()=>new Context(new Hashtable()));
+            registry.singleton<IContext>(() => new Context(new Hashtable()));
 
             registry.singleton(() => AsyncOperationManager.SynchronizationContext);
             registry.singleton<AsyncOperation>(() => AsyncOperationManager.CreateOperation(new object()));

@@ -7,7 +7,7 @@ using MoMoney.DTO;
 
 namespace MoMoney.boot.container.registration
 {
-    internal class wire_up_the_mappers_in_to_the : ICommand
+    class wire_up_the_mappers_in_to_the : ICommand
     {
         readonly IDependencyRegistration registry;
 

@@ -11,11 +11,11 @@ using MoMoney.Presentation.Model.Menu.File;
 using MoMoney.Presentation.Model.Menu.Help;
 using MoMoney.Presentation.Model.Menu.window;
 using MoMoney.Presentation.Presenters.Commands;
-using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Views;
 
 namespace MoMoney.boot.container.registration
 {
-    internal class wire_up_the_presentation_modules : ICommand, IParameterizedCommand<IAssembly>
+    class wire_up_the_presentation_modules : ICommand, IParameterizedCommand<IAssembly>
     {
         readonly IDependencyRegistration registry;
 
@@ -31,13 +31,14 @@ namespace MoMoney.boot.container.registration
 
         public void run(IAssembly item)
         {
-            Func<IApplicationController> target = () => new ApplicationController(Lazy.load<IPresenterRegistry>(), Lazy.load<IShell>());
-            registry.proxy<IApplicationController, SynchronizedConfiguration<IApplicationController>>( target.memorize());
+            Func<IApplicationController> target =
+                () => new ApplicationController(Lazy.load<IPresenterRegistry>(), Lazy.load<IShell>());
+            registry.proxy<IApplicationController, SynchronizedConfiguration<IApplicationController>>(target.memorize());
             registry.transient(typeof (IRunThe<>), typeof (RunThe<>));
             registry.transient<IFileMenu, FileMenu>();
             registry.transient<IWindowMenu, WindowMenu>();
             registry.transient<IHelpMenu, HelpMenu>();
-            
+
             item
                 .all_types()
                 .where(x => typeof (IPresenter).IsAssignableFrom(x))

@@ -2,12 +2,13 @@ using Gorilla.Commons.Infrastructure;
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Presentation.Views.billing;
 using MoMoney.Presentation.Views.reporting;
+using MoMoney.Presentation.Winforms.Views;
 
 namespace MoMoney.boot.container.registration
 {
-    internal class wire_up_the_reports_in_to_the : ICommand
+    class wire_up_the_reports_in_to_the : ICommand
     {
-        private readonly IDependencyRegistration registry;
+        readonly IDependencyRegistration registry;
 
         public wire_up_the_reports_in_to_the(IDependencyRegistration registry)
         {

@@ -11,10 +11,11 @@ using MoMoney.Presentation.Views.Navigation;
 using MoMoney.Presentation.Views.Shell;
 using MoMoney.Presentation.Views.Startup;
 using MoMoney.Presentation.Views.updates;
+using MoMoney.Presentation.Winforms.Views;
 
 namespace MoMoney.boot.container.registration
 {
-    internal class wire_up_the_views_in_to_the : ICommand
+    class wire_up_the_views_in_to_the : ICommand
     {
         readonly IDependencyRegistration register;
 

@@ -3,7 +3,7 @@ using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.boot.container
 {
-    internal class tear_down_the_container : ICommand
+    class tear_down_the_container : ICommand
     {
         public void run()
         {

@@ -6,34 +6,34 @@ using MoMoney.Domain.Core;
 
 namespace MoMoney.boot.container
 {
-    public static class type_extensions
+    static public class type_extensions
     {
-        public static ISpecification<Type> has_no_interfaces(this Type item)
+        static public ISpecification<Type> has_no_interfaces(this Type item)
         {
             return new PredicateSpecification<Type>(x => x.GetInterfaces().Length == 0);
         }
 
-        public static ISpecification<Type> subclasses_form(this Type item)
+        static public ISpecification<Type> subclasses_form(this Type item)
         {
             return new PredicateSpecification<Type>(x => typeof (Form).IsAssignableFrom(x));
         }
 
-        public static ISpecification<Type> is_an_implementation_of_dependency_registry(this Type item)
+        static public ISpecification<Type> is_an_implementation_of_dependency_registry(this Type item)
         {
             return new PredicateSpecification<Type>(x => typeof (IDependencyRegistry).IsAssignableFrom(x));
         }
 
-        public static ISpecification<Type> is_an_entity(this Type item)
+        static public ISpecification<Type> is_an_entity(this Type item)
         {
             return new PredicateSpecification<Type>(x => typeof (IEntity).IsAssignableFrom(x));
         }
 
-        public static ISpecification<Type> is_an_interface(this Type item)
+        static public ISpecification<Type> is_an_interface(this Type item)
         {
             return new PredicateSpecification<Type>(x => x.IsInterface);
         }
 
-        public static ISpecification<Type> is_abstract(this Type item)
+        static public ISpecification<Type> is_abstract(this Type item)
         {
             return new PredicateSpecification<Type>(x => x.IsAbstract);
         }

@@ -7,7 +7,7 @@ using MoMoney.boot.container.registration;
 
 namespace MoMoney.boot.container
 {
-    internal class wire_up_the_container : ICommand
+    class wire_up_the_container : ICommand
     {
         readonly IDependencyRegistration registry;
 

@@ -9,7 +9,7 @@ using MoMoney.Presentation.Model.messages;
 
 namespace MoMoney.boot
 {
-    internal class global_error_handling : ICommand
+    class global_error_handling : ICommand
     {
         public void run()
         {

@@ -2,9 +2,9 @@ using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.windows.ui
 {
-    internal class hookup
+    class hookup
     {
-        public static Command the<Command>() where Command : ICommand, new()
+        static public Command the<Command>() where Command : ICommand, new()
         {
             return new Command();
         }

@@ -5,7 +5,7 @@ using MoMoney.Modules.Core;
 
 namespace MoMoney.boot
 {
-    internal class start_the_application : ICommand
+    class start_the_application : ICommand
     {
         readonly IBackgroundThread thread;
         readonly ILoadPresentationModulesCommand command;

@@ -7,7 +7,8 @@ using MoMoney.Presentation;
 namespace MoMoney.Modules.Core
 {
     [Concern(typeof (LoadPresentationModulesCommand))]
-    public class when_loading_the_application_shell : concerns_for<ILoadPresentationModulesCommand, LoadPresentationModulesCommand>
+    public class when_loading_the_application_shell :
+        concerns_for<ILoadPresentationModulesCommand, LoadPresentationModulesCommand>
     {
         it should_initialize_all_the_presentation_modules = () => processor.was_told_to(x => x.add(module));
 

@@ -22,7 +22,8 @@ namespace MoMoney.Modules
 
         public class when_initializing_the_getting_started_module : behaves_like_the_getting_started_module
         {
-            it should_start_listening_for_when_a_new_project_is_started = () => broker.was_told_to(x => x.subscribe((GettingStartedModule)sut));
+            it should_start_listening_for_when_a_new_project_is_started =
+                () => broker.was_told_to(x => x.subscribe((GettingStartedModule) sut));
 
             because b = () => sut.run();
         }

@@ -59,10 +59,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\lib\app\gorilla\gorilla.commons.utility.dll</HintPath>
     </Reference>
-    <Reference Include="gorilla.commons.windows.forms, Version=2009.5.5.1633, Culture=neutral, PublicKeyToken=687787ccb6c36c9f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\build\lib\app\gorilla\gorilla.commons.windows.forms.dll</HintPath>
-    </Reference>
     <Reference Include="gorilla.testing, Version=2009.5.5.194, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\lib\test\gorilla\gorilla.testing.dll</HintPath>
@@ -178,7 +174,7 @@
     <Compile Include="Modules\Core\LoadPresentationModulesCommandSpecs.cs" />
     <Compile Include="boot\hookup.cs" />
     <Compile Include="Modules\Core\LoadPresentationModulesCommand.cs" />
-    <Compile Include="boot\bootstrap.cs" />
+    <Compile Include="bootstrap.cs" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

@@ -1,7 +1,8 @@
 using System;
-using MoMoney.Presentation.Views.Shell;
+using MoMoney.boot;
+using MoMoney.Presentation.Winforms.Views;
 
-namespace MoMoney.boot
+namespace MoMoney
 {
     public class Bootstrap : WindowsFormsApplication<ApplicationShell>
     {

@@ -1,6 +1,6 @@
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
-using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Views;
 
 namespace MoMoney.Presentation.Core
 {

@@ -1,7 +1,7 @@
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
+using MoMoney.Presentation.Views;
 using MoMoney.Presentation.Views.Core;
-using MoMoney.Presentation.Views.Shell;
 
 namespace MoMoney.Presentation.Core
 {

@@ -1,7 +1,7 @@
 using System.Windows.Forms;
 using Gorilla.Commons.Infrastructure.Threading;
 
-namespace MoMoney.Infrastructure.System
+namespace MoMoney.Presentation.Core
 {
     public interface IApplication
     {

@@ -1,5 +1,5 @@
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Views;
 
 namespace MoMoney.Presentation.Model.Menu.File.Commands
 {

@@ -1,6 +1,6 @@
 using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.System;
+using MoMoney.Presentation.Core;
 using MoMoney.Presentation.Model.messages;
 
 namespace MoMoney.Presentation.Model.Menu.File.Commands

@@ -1,7 +1,7 @@
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Testing;
-using MoMoney.Infrastructure.System;
+using MoMoney.Presentation.Core;
 using MoMoney.Presentation.Model.messages;
 
 namespace MoMoney.Presentation.Model.Menu.File.Commands

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using Gorilla.Commons.Windows.Forms.Keyboard;
 using MoMoney.Presentation.Model.Menu.File.Commands;
 using MoMoney.Presentation.Model.Projects;
-using MoMoney.Presentation.Resources;
+using MoMoney.Presentation.Winforms.Keyboard;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Model.Menu.File
 {

@@ -4,7 +4,7 @@ using MoMoney.Presentation.Model.Menu.Help.commands;
 using MoMoney.Presentation.Presenters;
 using MoMoney.Presentation.Presenters.Shell;
 using MoMoney.Presentation.Presenters.updates;
-using MoMoney.Presentation.Resources;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Model.Menu.Help
 {

@@ -1,6 +1,6 @@
 using System;
 using Gorilla.Commons.Utility.Core;
-using Gorilla.Commons.Windows.Forms.Resources;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Model.Menu
 {

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
-using Gorilla.Commons.Windows.Forms.Keyboard;
-using Gorilla.Commons.Windows.Forms.Resources;
+using MoMoney.Presentation.Winforms.Keyboard;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Model.Menu
 {

@@ -3,9 +3,8 @@ using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Infrastructure.Threading;
 using Gorilla.Commons.Utility.Core;
-using Gorilla.Commons.Windows.Forms.Keyboard;
-using Gorilla.Commons.Windows.Forms.Resources;
-using MoMoney.Presentation.Resources;
+using MoMoney.Presentation.Winforms.Keyboard;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Model.Menu
 {

@@ -4,7 +4,7 @@ using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Infrastructure.Threading;
 using Gorilla.Commons.Utility.Core;
-using Gorilla.Commons.Windows.Forms.Resources;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Model.Menu
 {

@@ -1,6 +1,6 @@
 using MoMoney.Presentation.Presenters;
 using MoMoney.Presentation.Presenters.billing;
-using MoMoney.Presentation.Resources;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Model.Navigation
 {

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

@@ -1,5 +1,5 @@
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Presentation.Resources;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Model.Navigation
 {

@@ -1,6 +1,6 @@
 using System;
 using Gorilla.Commons.Utility.Core;
-using Gorilla.Commons.Windows.Forms.Resources;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Model.Navigation
 {

@@ -2,7 +2,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 using Gorilla.Commons.Utility.Core;
-using Gorilla.Commons.Windows.Forms.Resources;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Model.Navigation
 {

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

@@ -1,6 +1,6 @@
 using MoMoney.Presentation.Presenters.Commands;
 using MoMoney.Presentation.Presenters.reporting;
-using MoMoney.Presentation.Resources;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Model.Navigation
 {

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

@@ -1,4 +1,4 @@
-using MoMoney.Presentation.Resources;
+using MoMoney.Presentation.Winforms.Resources;
 using XPExplorerBar;
 
 namespace MoMoney.Presentation.Presenters.Navigation

@@ -1,5 +1,5 @@
 using MoMoney.Presentation.Presenters.income;
-using MoMoney.Presentation.Resources;
+using MoMoney.Presentation.Winforms.Resources;
 using XPExplorerBar;
 
 namespace MoMoney.Presentation.Presenters.Navigation

@@ -1,5 +1,5 @@
 using MoMoney.Presentation.Presenters.reporting;
-using MoMoney.Presentation.Resources;
+using MoMoney.Presentation.Winforms.Resources;
 using XPExplorerBar;
 
 namespace MoMoney.Presentation.Presenters.Navigation

@@ -2,7 +2,7 @@ using Gorilla.Commons.Infrastructure.Eventing;
 using MoMoney.Presentation.Core;
 using MoMoney.Presentation.Model.Menu.File.Commands;
 using MoMoney.Presentation.Model.messages;
-using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Views;
 
 namespace MoMoney.Presentation.Presenters.Shell
 {

@@ -2,7 +2,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 using Gorilla.Commons.Utility.Core;
-using Gorilla.Commons.Windows.Forms.Resources;
+using MoMoney.Presentation.Winforms.Resources;
 using XPExplorerBar;
 
 namespace MoMoney.Presentation.Presenters.Navigation

@@ -1,8 +1,8 @@
 using System.Net.NetworkInformation;
 using Gorilla.Commons.Infrastructure.Eventing;
 using MoMoney.Presentation.Model.messages;
-using MoMoney.Presentation.Resources;
 using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Presenters.Shell
 {

@@ -1,8 +1,8 @@
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Testing;
-using MoMoney.Presentation.Resources;
 using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Presenters.Shell
 {

@@ -1,6 +1,6 @@
 using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.System;
+using MoMoney.Presentation.Core;
 using MoMoney.Presentation.Model.messages;
 
 namespace MoMoney.Presentation.Presenters.Commands

@@ -1,5 +1,6 @@
 using Gorilla.Commons.Infrastructure.Threading;
 using MoMoney.Presentation.Views.Startup;
+using MoMoney.Presentation.Winforms.Views;
 using MoMoney.Utility.Core;
 
 namespace MoMoney.Presentation.Presenters.Startup

@@ -2,8 +2,8 @@ using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Utility;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Presentation.Model.messages;
-using MoMoney.Presentation.Resources;
 using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Presenters.Shell
 {

@@ -2,8 +2,8 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Testing;
 using MoMoney.Presentation.Model.messages;
-using MoMoney.Presentation.Resources;
 using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Presenters.Shell
 {

@@ -5,8 +5,8 @@ using MoMoney.Presentation.Core;
 using MoMoney.Presentation.Model.Menu;
 using MoMoney.Presentation.Model.Menu.File.Commands;
 using MoMoney.Presentation.Model.Projects;
-using MoMoney.Presentation.Resources;
 using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Presenters.Shell
 {

@@ -1,22 +0,0 @@
-using System;
-using developwithpassion.bdd.contexts;
-using Gorilla.Commons.Testing;
-using MoMoney.Presentation.Model.Menu.File.Commands;
-
-namespace MoMoney.Presentation.Views.Shell
-{
-    public class behaves_like_application_shell : concerns_for<IShell, ApplicationShell>
-    {
-    }
-
-    //public class when_the_application_shell_is_closed : behaves_like_application_shell
-    //{
-    //    it should_execute_the_close_command = () => close_command.was_told_to(x => x.run());
-
-    //    context c = () => { close_command = the_dependency<ICloseCommand>(); };
-
-    //    because b = () => EventTrigger.trigger_event<Events.FormEvents>(x => x.OnClosed(new EventArgs()), sut);
-
-    //    static ICloseCommand close_command;
-    //}
-}
\ No newline at end of file

@@ -1,13 +1,11 @@
-using System.Windows.Forms;
-using Gorilla.Commons.Windows.Forms.Resources;
 using MoMoney.Presentation.Views.Core;
+using MoMoney.Presentation.Winforms.Resources;
 using WeifenLuo.WinFormsUI.Docking;
 
-namespace MoMoney.Presentation.Views.core
+namespace MoMoney.Presentation.Views
 {
     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();

@@ -1,5 +1,5 @@
 using System;
-using Gorilla.Commons.Windows.Forms.Resources;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Views.Shell
 {

@@ -2,8 +2,9 @@ using System.ComponentModel;
 using System.Windows.Forms;
 using MoMoney.Presentation.Presenters.Shell;
 using MoMoney.Presentation.Views.Core;
+using MoMoney.Presentation.Views.Shell;
 
-namespace MoMoney.Presentation.Views.Shell
+namespace MoMoney.Presentation.Views
 {
     public interface IShell : IWin32Window, ISynchronizeInvoke, IContainerControl, IBindableComponent, IDropTarget,
                               IRegionManager

@@ -1,4 +1,4 @@
-using Gorilla.Commons.Windows.Forms.Resources;
+using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Views.Shell
 {

@@ -1,7 +1,8 @@
 using System;
 using System.ComponentModel;
+using MoMoney.Presentation.Views.Core;
 
-namespace MoMoney.Presentation.Views.Core
+namespace MoMoney.Presentation.Views
 {
     public interface IWindowEvents
     {

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

@@ -2,9 +2,8 @@ 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
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     public class BindingSelectorSpecs
     {

@@ -2,7 +2,7 @@ using System.Windows.Forms;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     [Concern(typeof (Create))]
     public class when_binding_a_property_from_an_object_to_a_combo_box : concerns

@@ -1,7 +1,7 @@
 using System.Windows.Forms;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     public class ComboBoxPropertyBinding<TypeToBindTo, PropertyType> : IPropertyBinding<PropertyType>
     {

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     public static class ControlBindingExtensions
     {

@@ -1,9 +1,8 @@
 using System;
 using System.Linq.Expressions;
 using System.Windows.Forms;
-using MoMoney.Presentation.Winforms.Databinding;
 
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     public static class Create
     {

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

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     public class DateTimePickerPropertyBinding<TypeToBindTo> : IPropertyBinding<DateTime>
     {

@@ -3,7 +3,7 @@ using System.Windows.Forms;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     [Concern(typeof (Create))]
     public class when_a_new_date_is_selected_by_a_date_time_picker_that_is_bound_to_a_property : concerns

@@ -1,4 +1,4 @@
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     public interface IPropertyBinding<PropertyType>
     {

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Windows.Forms;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     static public class ListboxExtensions
     {

@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     public interface IPropertyBinder<TypeToBindTo, PropertyType>
     {

@@ -2,7 +2,7 @@ using System.Reflection;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     [Concern(typeof (PropertyBinder<,>))]
     public abstract class behaves_like_a_property_binder :

@@ -3,7 +3,7 @@ using System.Linq.Expressions;
 using System.Reflection;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     public interface IPropertyInspector<TypeToBindTo, TypeOfProperty>
     {

@@ -1,4 +1,4 @@
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     public interface IPropertyInspectorFactory
     {

@@ -2,7 +2,7 @@ using System.Reflection;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     [Concern(typeof (PropertyInspector<,>))]
     public class when_parsing_a_valie_expression_for_the_information_on_the_property :

@@ -2,7 +2,7 @@ using System.Windows.Forms;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     [Concern(typeof (Create))]
     public class when_binding_a_property_on_an_object_to_a_textbox : concerns

@@ -1,7 +1,7 @@
 using System.Windows.Forms;
-using Gorilla.Commons.Windows.Forms.Helpers;
+using MoMoney.Presentation.Winforms.Helpers;
 
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     static public class TextBoxExtensions
     {

@@ -1,7 +1,7 @@
 using System.Windows.Forms;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace Gorilla.Commons.Windows.Forms.Databinding
+namespace MoMoney.Presentation.Winforms.Databinding
 {
     public class TextPropertyBinding<TypeToBindTo, PropertyType> : IPropertyBinding<PropertyType>
     {

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public class BindableListBox<TItemToBindTo> : IBindableList<TItemToBindTo>
     {

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public class BindableListBoxSpecs
     {

@@ -1,6 +1,6 @@
 using System.Windows.Forms;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     static public class BindableListExtensions
     {

@@ -1,4 +1,4 @@
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     static public class BindableListFactory
     {

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public interface IBindableTextBox<T>
     {

@@ -2,7 +2,7 @@ using System;
 using System.Linq.Expressions;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     static public class BindableTextBoxExtensions
     {

@@ -3,7 +3,7 @@ using System.Windows.Forms;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public class BindableTextBoxExtensionsSpecs
     {
@@ -12,7 +12,7 @@ namespace Gorilla.Commons.Windows.Forms.Helpers
     [Concern(typeof (BindableTextBoxExtensions))]
     public class when_binding_a_text_control_to_a_command : concerns
     {
-        it should_run_each_command_when_the_text_changes_in_the_text_control = () => command.was_told_to(x => x.run(result));
+        it should_run_each_command_when_the_text_changes_in_the_text_control = () => command.was_told_to<ITextBoxCommand<string>>(x => x.run(result));
 
         context c = () =>
                         {

@@ -3,7 +3,7 @@ using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public class BindableTextBoxSpecs
     {

@@ -2,7 +2,7 @@ using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Windows.Forms;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public static class BitmapRegion
     {

@@ -4,7 +4,7 @@ using System.Windows.Forms;
 using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Utility.Core;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     static public class ButtonExtensions
     {

@@ -1,6 +1,6 @@
 using System.Windows.Forms;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public class ComboBoxListControl<TItemToStore> : IListControl<TItemToStore>
     {

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public class ControlAdapter : Control
     {

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     static public class ControlExtensions
     {

@@ -2,7 +2,7 @@ using System;
 using System.ComponentModel;
 using System.Windows.Forms;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public class Events
     {

@@ -5,7 +5,7 @@ using System.Linq.Expressions;
 using System.Reflection;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public static class EventTrigger
     {

@@ -1,7 +1,7 @@
 using System;
 using System.Linq.Expressions;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public static class EventTriggerExtensions
     {

@@ -3,7 +3,7 @@ using System.Windows.Forms;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     [Concern(typeof (EventTrigger))]
     public class when_invoking_a_call_on_a_target_via_reflection : concerns
@@ -11,8 +11,8 @@ namespace Gorilla.Commons.Windows.Forms.Helpers
         it should_correctly_call_that_method =
             () =>
                 {
-                    control.called_on_key_press.should_be_true();
-                    control.called_on_enter.should_be_false();
+                    Assertions.should_be_true(control.called_on_key_press);
+                    Assertions.should_be_false(control.called_on_enter);
                 };
 
         context c = () => { control = new TestControl(); };

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public interface IBindableList<ItemToBindTo>
     {

@@ -1,4 +1,4 @@
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public interface IEventTarget
     {

@@ -1,4 +1,4 @@
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public interface IListControl<ItemToStore>
     {

@@ -1,6 +1,6 @@
 using Gorilla.Commons.Utility.Core;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public interface ITextBoxCommand<T> : IParameterizedCommand<IBindableTextBox<T>>
     {

@@ -1,6 +1,6 @@
 using System;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public interface ITextControl<ItemToStore>
     {

@@ -1,6 +1,6 @@
 using System.Windows.Forms;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public class ListBoxListControl<TItemToStore> : IListControl<TItemToStore>
     {

@@ -1,7 +1,7 @@
 using System;
 using System.Linq.Expressions;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public class RebindTextBoxCommand<T> : ITextBoxCommand<T>
     {

@@ -3,7 +3,7 @@ using System.Linq.Expressions;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public class RebindTextBoxCommandSpecs
     {

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public class SuspendLayout : IDisposable
     {

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public class TextControl<ItemToStore> : ITextControl<ItemToStore>
     {

@@ -4,7 +4,7 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Core;
 
-namespace Gorilla.Commons.Windows.Forms.Helpers
+namespace MoMoney.Presentation.Winforms.Helpers
 {
     public class TextControlSpecs
     {

@@ -1,7 +0,0 @@
-namespace Gorilla.Commons.Windows.Forms.Helpers
-{
-    public class ValidateTextBoxCommandSpecs
-    {
-        
-    }
-}
\ No newline at end of file

@@ -1,6 +1,6 @@
 using System.Windows.Forms;
 
-namespace Gorilla.Commons.Windows.Forms.Keyboard
+namespace MoMoney.Presentation.Winforms.Keyboard
 {
     public class ShortcutKey
     {

@@ -1,6 +1,6 @@
 using System.Windows.Forms;
 
-namespace Gorilla.Commons.Windows.Forms.Keyboard
+namespace MoMoney.Presentation.Winforms.Keyboard
 {
     static public class ShortcutKeys
     {

@@ -1,7 +1,7 @@
 using ComponentFactory.Krypton.Toolkit;
-using Gorilla.Commons.Windows.Forms.Helpers;
+using MoMoney.Presentation.Winforms.Helpers;
 
-namespace Gorilla.Commons.Windows.Forms.Krypton
+namespace MoMoney.Presentation.Winforms.Krypton
 {
     static public class BindableListExtensions
     {

@@ -1,7 +1,7 @@
 using ComponentFactory.Krypton.Toolkit;
-using Gorilla.Commons.Windows.Forms.Helpers;
+using MoMoney.Presentation.Winforms.Helpers;
 
-namespace Gorilla.Commons.Windows.Forms.Krypton
+namespace MoMoney.Presentation.Winforms.Krypton
 {
     public class KryptonComboBoxListControl<TItemToStore> : IListControl<TItemToStore>
     {

@@ -1,7 +1,7 @@
 using ComponentFactory.Krypton.Toolkit;
-using Gorilla.Commons.Windows.Forms.Helpers;
+using MoMoney.Presentation.Winforms.Helpers;
 
-namespace Gorilla.Commons.Windows.Forms.Krypton
+namespace MoMoney.Presentation.Winforms.Krypton
 {
     public class KryptonListBoxListControl<TItemToStore> : IListControl<TItemToStore>
     {

@@ -1,8 +1,8 @@
 using System;
 using ComponentFactory.Krypton.Toolkit;
-using Gorilla.Commons.Windows.Forms.Helpers;
+using MoMoney.Presentation.Winforms.Helpers;
 
-namespace Gorilla.Commons.Windows.Forms.Krypton
+namespace MoMoney.Presentation.Winforms.Krypton
 {
     public class KryptonTextControl<T> : ITextControl<T>
     {

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using ComponentFactory.Krypton.Toolkit;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace Gorilla.Commons.Windows.Forms.Krypton
+namespace MoMoney.Presentation.Winforms.Krypton
 {
     static public class ListboxExtensions
     {

@@ -1,7 +1,7 @@
 using ComponentFactory.Krypton.Toolkit;
-using Gorilla.Commons.Windows.Forms.Helpers;
+using MoMoney.Presentation.Winforms.Helpers;
 
-namespace Gorilla.Commons.Windows.Forms.Krypton
+namespace MoMoney.Presentation.Winforms.Krypton
 {
     static public class TextBoxExtensions
     {

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.IO;
 using Gorilla.Commons.Infrastructure.Reflection;
 
-namespace Gorilla.Commons.Windows.Forms.Resources
+namespace MoMoney.Presentation.Winforms.Resources
 {
     public class ApplicationIcon : IDisposable
     {

@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using Gorilla.Commons.Utility.Extensions;
-using Gorilla.Commons.Windows.Forms.Resources;
 
-namespace MoMoney.Presentation.Resources
+namespace MoMoney.Presentation.Winforms.Resources
 {
     static public class ApplicationIcons
     {

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.IO;
 using Gorilla.Commons.Infrastructure.Reflection;
 
-namespace Gorilla.Commons.Windows.Forms.Resources
+namespace MoMoney.Presentation.Winforms.Resources
 {
     public class ApplicationImage : IDisposable
     {

@@ -1,6 +1,4 @@
-using Gorilla.Commons.Windows.Forms.Resources;
-
-namespace MoMoney.Presentation.Resources
+namespace MoMoney.Presentation.Winforms.Resources
 {
     public static class ApplicationImages
     {

@@ -1,7 +1,7 @@
 using System;
 using System.Drawing;
 
-namespace Gorilla.Commons.Windows.Forms.Resources
+namespace MoMoney.Presentation.Winforms.Resources
 {
     public class HybridIcon : ApplicationIcon
     {

@@ -1,10 +1,10 @@
 using System;
 using System.Reflection;
 using Gorilla.Commons.Utility.Extensions;
-using MoMoney.Presentation.Resources;
-using MoMoney.Presentation.Views.core;
+using MoMoney.Presentation.Views.Menu;
+using MoMoney.Presentation.Winforms.Resources;
 
-namespace MoMoney.Presentation.Views.Menu
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class AboutTheApplicationView : ApplicationDockedWindow, IAboutApplicationView
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Views.Menu
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class AboutTheApplicationView
     {

@@ -1,14 +1,14 @@
 using System;
 using System.Collections.Generic;
 using Gorilla.Commons.Utility.Extensions;
-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.billing;
 using MoMoney.Presentation.Views.Core;
+using MoMoney.Presentation.Winforms.Helpers;
+using MoMoney.Presentation.Winforms.Krypton;
 
-namespace MoMoney.Presentation.Views.billing
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class AddBillPaymentView : ApplicationDockedWindow, IAddBillPaymentView
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Views.billing
+namespace MoMoney.Presentation.Winforms.Views
 {
     partial class AddBillPaymentView
     {

@@ -3,14 +3,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using Gorilla.Commons.Utility.Extensions;
-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;
 using MoMoney.Presentation.Views.Core;
+using MoMoney.Presentation.Winforms.Databinding;
+using MoMoney.Presentation.Winforms.Resources;
 
-namespace MoMoney.Presentation.Views
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class AddCompanyView : ApplicationDockedWindow, IAddCompanyView
     {
@@ -34,7 +34,7 @@ namespace MoMoney.Presentation.Views
 
         public void attach_to(IAddCompanyPresenter presenter)
         {
-            ux_company_name.bind_to(dto, x => x.company_name);
+            Create.bind_to(ux_company_name, dto, x => x.company_name);
             submit_button = x => presenter.submit(dto);
         }
 

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Views
+namespace MoMoney.Presentation.Winforms.Views
 {
     partial class AddCompanyView
     {

@@ -1,14 +1,14 @@
 using System;
 using System.Collections.Generic;
 using Gorilla.Commons.Utility.Extensions;
-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;
+using MoMoney.Presentation.Views.income;
+using MoMoney.Presentation.Winforms.Helpers;
+using MoMoney.Presentation.Winforms.Krypton;
 
-namespace MoMoney.Presentation.Views.income
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class AddNewIncomeView : ApplicationDockedWindow, IAddNewIncomeView
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Views.income
+namespace MoMoney.Presentation.Winforms.Views
 {
     partial class AddNewIncomeView
     {

@@ -3,13 +3,13 @@ using System.ComponentModel;
 using System.Linq;
 using System.Windows.Forms;
 using Gorilla.Commons.Utility.Extensions;
-using Gorilla.Commons.Windows.Forms.Helpers;
-using Gorilla.Commons.Windows.Forms.Resources;
-using MoMoney.Presentation.Resources;
+using MoMoney.Presentation.Views;
 using MoMoney.Presentation.Views.Core;
+using MoMoney.Presentation.Winforms.Helpers;
+using MoMoney.Presentation.Winforms.Resources;
 using WeifenLuo.WinFormsUI.Docking;
 
-namespace MoMoney.Presentation.Views.core
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class ApplicationDockedWindow : DockContent, IApplicationDockedWindow
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Views.core
+namespace MoMoney.Presentation.Winforms.Views
 {
     partial class ApplicationDockedWindow
     {

@@ -4,12 +4,12 @@ using System.ComponentModel;
 using System.ComponentModel.Composition;
 using System.Windows.Forms;
 using Gorilla.Commons.Utility.Extensions;
-using Gorilla.Commons.Windows.Forms.Helpers;
 using MoMoney.Presentation.Presenters.Shell;
-using MoMoney.Presentation.Views.core;
+using MoMoney.Presentation.Views;
 using MoMoney.Presentation.Views.Core;
+using MoMoney.Presentation.Winforms.Helpers;
 
-namespace MoMoney.Presentation.Views.Shell
+namespace MoMoney.Presentation.Winforms.Views
 {
     [Export(typeof (IShell))]
     public partial class ApplicationShell : ApplicationWindow, IShell

@@ -1,4 +1,5 @@
-namespace MoMoney.Presentation.Views.Shell {
+namespace MoMoney.Presentation.Winforms.Views
+{
     partial class ApplicationShell
     {
         /// <summary>
@@ -65,8 +66,8 @@ namespace MoMoney.Presentation.Views.Shell {
             // ux_status_bar
             // 
             this.ux_status_bar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.status_bar_label,
-            this.status_bar_progress_bar});
+                                                                                           this.status_bar_label,
+                                                                                           this.status_bar_progress_bar});
             this.ux_status_bar.Location = new System.Drawing.Point(0, 485);
             this.ux_status_bar.Name = "ux_status_bar";
             this.ux_status_bar.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;

@@ -0,0 +1,26 @@
+using System;
+using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
+using MoMoney.Presentation.Presenters.Shell;
+using MoMoney.Presentation.Views;
+using MoMoney.Presentation.Winforms.Helpers;
+
+namespace MoMoney.Presentation.Winforms.Views
+{
+    public class behaves_like_application_shell : concerns_for<IShell, ApplicationShell>
+    {
+    }
+
+    public class when_the_application_shell_is_closed : behaves_like_application_shell
+    {
+        it should_execute_the_close_command = () => presenter.was_told_to(x => x.shut_down());
+
+        context c = () => { presenter = an<IApplicationShellPresenter>(); };
+
+        after_the_sut_has_been_created a = () => { sut.attach_to(presenter); };
+
+        because b = () => EventTrigger.trigger_event<Events.FormEvents>(x => x.OnClosed(new EventArgs()), sut);
+
+        static IApplicationShellPresenter presenter;
+    }
+}
\ No newline at end of file

@@ -1,11 +1,12 @@
 using System;
 using System.ComponentModel;
 using System.Windows.Forms;
-using Gorilla.Commons.Windows.Forms.Helpers;
-using MoMoney.Presentation.Resources;
+using MoMoney.Presentation.Views.core;
 using MoMoney.Presentation.Views.Core;
+using MoMoney.Presentation.Winforms.Helpers;
+using MoMoney.Presentation.Winforms.Resources;
 
-namespace MoMoney.Presentation.Views.core
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class ApplicationWindow : Form, IApplicationWindow
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Views.core
+namespace MoMoney.Presentation.Winforms.Views
 {
     partial class ApplicationWindow
     {

@@ -4,12 +4,12 @@ using System.Windows.Forms;
 using Gorilla.Commons.Utility;
 using MoMoney.DTO;
 using MoMoney.Presentation.Presenters.updates;
-using MoMoney.Presentation.Resources;
-using MoMoney.Presentation.Views.core;
+using MoMoney.Presentation.Views;
 using MoMoney.Presentation.Views.Core;
-using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Views.updates;
+using MoMoney.Presentation.Winforms.Resources;
 
-namespace MoMoney.Presentation.Views.updates
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class CheckForUpdatesView : ApplicationWindow, ICheckForUpdatesView
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Views.updates
+namespace MoMoney.Presentation.Winforms.Views
 {
     partial class CheckForUpdatesView
     {
@@ -49,7 +49,7 @@ namespace MoMoney.Presentation.Views.updates
             this.label3.Size = new System.Drawing.Size(364, 2);
             this.label3.TabIndex = 15;
             this.label3.Text = "                                                                                 " +
-                "       ";
+                               "       ";
             // 
             // label2
             // 

@@ -1,6 +1,6 @@
-using MoMoney.Presentation.Views.core;
+using MoMoney.Presentation.Views.Shell;
 
-namespace MoMoney.Presentation.Views.Shell
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class LogFileView : ApplicationDockedWindow, ILogFileView
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Views.Shell
+namespace MoMoney.Presentation.Winforms.Views
 {
     partial class LogFileView
     {

@@ -1,10 +1,10 @@
-using Gorilla.Commons.Windows.Forms.Helpers;
 using MoMoney.Presentation.Presenters.Navigation;
-using MoMoney.Presentation.Resources;
-using MoMoney.Presentation.Views.core;
+using MoMoney.Presentation.Views.Navigation;
+using MoMoney.Presentation.Winforms.Helpers;
+using MoMoney.Presentation.Winforms.Resources;
 using WeifenLuo.WinFormsUI.Docking;
 
-namespace MoMoney.Presentation.Views.Navigation
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class MainMenuView : ApplicationDockedWindow, IMainMenuView
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Views.Navigation
+namespace MoMoney.Presentation.Winforms.Views
 {
     partial class MainMenuView
     {

@@ -1,12 +1,12 @@
 using System.Windows.Forms;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Presentation.Model.Navigation;
-using MoMoney.Presentation.Resources;
-using MoMoney.Presentation.Views.core;
-using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Views;
+using MoMoney.Presentation.Views.Navigation;
+using MoMoney.Presentation.Winforms.Resources;
 using WeifenLuo.WinFormsUI.Docking;
 
-namespace MoMoney.Presentation.Views.Navigation
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class NavigationView : ApplicationDockedWindow, INavigationView
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Views.Navigation
+namespace MoMoney.Presentation.Winforms.Views
 {
     partial class NavigationView
     {

@@ -1,14 +1,14 @@
 using System.Windows.Forms;
 using Gorilla.Commons.Utility.Extensions;
-using Gorilla.Commons.Windows.Forms.Resources;
 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 MoMoney.Presentation.Winforms.Resources;
 using MenuItem=System.Windows.Forms.MenuItem;
 
-namespace MoMoney.Presentation.Views
+namespace MoMoney.Presentation.Winforms.Views
 {
     public class NotificationIconView : INotificationIconView
     {

@@ -2,9 +2,9 @@ using System;
 using DataDynamics.ActiveReports;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Presentation.Model.reporting;
-using MoMoney.Presentation.Views.core;
+using MoMoney.Presentation.Views.reporting;
 
-namespace MoMoney.Presentation.Views.reporting
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class ReportViewer : ApplicationDockedWindow, IReportViewer
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Views.reporting
+namespace MoMoney.Presentation.Winforms.Views
 {
     partial class ReportViewer
     {

@@ -2,11 +2,11 @@ using System;
 using System.ComponentModel;
 using System.Windows.Forms;
 using MoMoney.Presentation.Model.Menu.File.Commands;
-using MoMoney.Presentation.Resources;
-using MoMoney.Presentation.Views.core;
 using MoMoney.Presentation.Views.Core;
+using MoMoney.Presentation.Views.dialogs;
+using MoMoney.Presentation.Winforms.Resources;
 
-namespace MoMoney.Presentation.Views.dialogs
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class SaveChangesView : ApplicationWindow, ISaveChangesView
     {

@@ -1,6 +1,6 @@
-namespace MoMoney.Presentation.Views.dialogs
+namespace MoMoney.Presentation.Winforms.Views
 {
-public    partial class SaveChangesView
+    public    partial class SaveChangesView
     {
         /// <summary>
         /// Required designer variable.
@@ -134,7 +134,7 @@ public    partial class SaveChangesView
 
         #endregion
 
-    public System.Windows.Forms.Button save_button;
+        public System.Windows.Forms.Button save_button;
         public System.Windows.Forms.Button do_not_save_button;
         public System.Windows.Forms.Button cancel_button;
         public System.Windows.Forms.PictureBox ux_image;

@@ -1,10 +1,10 @@
 using System;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
-using Gorilla.Commons.Windows.Forms.Helpers;
 using MoMoney.Presentation.Model.Menu.File.Commands;
+using MoMoney.Presentation.Winforms.Helpers;
 
-namespace MoMoney.Presentation.Views.dialogs
+namespace MoMoney.Presentation.Winforms.Views
 {
     [Concern(typeof(SaveChangesView))]
     [Integration]

@@ -1,7 +1,8 @@
 using System.Windows.Forms;
 using Gorilla.Commons.Infrastructure.FileSystem;
+using MoMoney.Presentation.Views.dialogs;
 
-namespace MoMoney.Presentation.Views.dialogs
+namespace MoMoney.Presentation.Winforms.Views
 {
     public class SelectFileToOpenDialog : ISelectFileToOpenDialog
     {

@@ -1,7 +1,8 @@
 using System.Windows.Forms;
 using Gorilla.Commons.Infrastructure.FileSystem;
+using MoMoney.Presentation.Views.dialogs;
 
-namespace MoMoney.Presentation.Views.dialogs
+namespace MoMoney.Presentation.Winforms.Views
 {
     public class SelectFileToSaveToDialog : ISelectFileToSaveToDialog
     {

@@ -1,9 +1,9 @@
 using System;
 using System.Windows.Forms;
-using MoMoney.Presentation.Resources;
-using MoMoney.Presentation.Views.core;
+using MoMoney.Presentation.Views.Startup;
+using MoMoney.Presentation.Winforms.Resources;
 
-namespace MoMoney.Presentation.Views.Startup
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class SplashScreenView : ApplicationWindow, ISplashScreenView
     {

@@ -1,4 +1,5 @@
-namespace MoMoney.Presentation.Views.Startup {
+namespace MoMoney.Presentation.Winforms.Views
+{
     partial class SplashScreenView
     {
         /// <summary>

@@ -1,7 +1,8 @@
 using System.Windows.Forms;
-using Gorilla.Commons.Windows.Forms.Resources;
+using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Winforms.Resources;
 
-namespace MoMoney.Presentation.Views.Shell
+namespace MoMoney.Presentation.Winforms.Views
 {
     public class StatusBarView : IStatusBarView
     {

@@ -1,6 +1,7 @@
 using Gorilla.Commons.Utility.Extensions;
+using MoMoney.Presentation.Views.Shell;
 
-namespace MoMoney.Presentation.Views.Shell
+namespace MoMoney.Presentation.Winforms.Views
 {
     public class TaskTrayMessage : ITaskTrayMessageView
     {

@@ -1,7 +1,8 @@
 using System.Windows.Forms;
+using MoMoney.Presentation.Views;
 using MoMoney.Presentation.Views.Shell;
 
-namespace MoMoney.Presentation.Views
+namespace MoMoney.Presentation.Winforms.Views
 {
     public class TitleBar : ITitleBar
     {

@@ -1,11 +1,11 @@
 using System;
 using System.Windows.Forms;
 using MoMoney.Presentation.Presenters.Shell;
-using MoMoney.Presentation.Resources;
-using MoMoney.Presentation.Views.core;
 using MoMoney.Presentation.Views.Core;
+using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Winforms.Resources;
 
-namespace MoMoney.Presentation.Views.Shell
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class UnhandledErrorView : ApplicationWindow, IUnhandledErrorView
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Views.Shell
+namespace MoMoney.Presentation.Winforms.Views
 {
     partial class UnhandledErrorView
     {

@@ -2,9 +2,9 @@ using System.Collections.Generic;
 using System.Linq;
 using MoMoney.DTO;
 using MoMoney.Presentation.Presenters.billing;
-using MoMoney.Presentation.Views.core;
+using MoMoney.Presentation.Views.billing;
 
-namespace MoMoney.Presentation.Views.billing
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class ViewAllBills : ApplicationDockedWindow, IViewAllBills
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Views.billing
+namespace MoMoney.Presentation.Winforms.Views
 {
     partial class ViewAllBills
     {

@@ -4,8 +4,9 @@ using DataDynamics.ActiveReports;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.DTO;
 using MoMoney.Presentation.Model.reporting;
+using MoMoney.Presentation.Views.billing;
 
-namespace MoMoney.Presentation.Views.billing
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class ViewAllBillsReport : ActiveReport, IViewAllBillsReport
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Views.billing
+namespace MoMoney.Presentation.Winforms.Views
 {
     /// <summary>
     /// Summary description for view_all_bills.

@@ -2,9 +2,9 @@ using System.Collections.Generic;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.DTO;
 using MoMoney.Presentation.Presenters.income;
-using MoMoney.Presentation.Views.core;
+using MoMoney.Presentation.Views.income;
 
-namespace MoMoney.Presentation.Views.income
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class ViewAllIncome : ApplicationDockedWindow, IViewIncomeHistory
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Views.income
+namespace MoMoney.Presentation.Winforms.Views
 {
     partial class ViewAllIncome
     {

@@ -1,10 +1,10 @@
-using Gorilla.Commons.Windows.Forms.Helpers;
 using MoMoney.Presentation.Model.Menu.File.Commands;
 using MoMoney.Presentation.Presenters.Shell;
-using MoMoney.Presentation.Resources;
-using MoMoney.Presentation.Views.core;
+using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Winforms.Helpers;
+using MoMoney.Presentation.Winforms.Resources;
 
-namespace MoMoney.Presentation.Views.Shell
+namespace MoMoney.Presentation.Winforms.Views
 {
     public partial class WelcomeScreen : ApplicationDockedWindow, IGettingStartedView
     {
@@ -18,8 +18,7 @@ namespace MoMoney.Presentation.Views.Shell
                 .will_execute<IOpenCommand>(() => true)
                 .with_tool_tip("Open Existing File", "Open an existing project.");
 
-            ux_create_new_file_button
-                .will_be_shown_as(ApplicationImages.CreateNewFile)
+            ux_create_new_file_button.will_be_shown_as(ApplicationImages.CreateNewFile)
                 .when_hovered_over_will_show(ApplicationImages.CreateNewFileSelected)
                 .will_execute<INewCommand>(() => true)
                 .with_tool_tip("Create New File", "Create a new project.");