Commit 873512a

@@ -1,12 +1,11 @@
 using Castle.Core.Interceptor;
+using Gorilla.Commons.Infrastructure.Logging;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Service.Infrastructure.Eventing;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {
-    public interface INotifyProgressInterceptor : IInterceptor
-    {
-    }
+    public interface INotifyProgressInterceptor : IInterceptor {}
 
     public class NotifyProgressInterceptor : INotifyProgressInterceptor
     {
@@ -19,9 +18,13 @@ namespace MoMoney.boot.container.registration.proxy_configuration
 
         public void Intercept(IInvocation invocation)
         {
-            broker.publish(new StartedRunningCommand(invocation.TargetType.Name));
+            this.log().debug("declaring type: {0}", invocation.GetConcreteMethodInvocationTarget().DeclaringType);
+            this.log().debug("target type: {0}", invocation.TargetType);
+            this.log().debug("proxy type: {0}", invocation.Proxy);
+            this.log().debug("invocation target: {0}", invocation.InvocationTarget);
+            broker.publish(new StartedRunningCommand(invocation.InvocationTarget));
             invocation.Proceed();
-            broker.publish(new FinishedRunningCommand(invocation.TargetType.Name));
+            broker.publish(new FinishedRunningCommand(invocation.InvocationTarget));
         }
     }
 }
\ No newline at end of file

@@ -1,6 +1,6 @@
 using Gorilla.Commons.Infrastructure.Castle.DynamicProxy;
-using Gorilla.Commons.Infrastructure.Castle.DynamicProxy.Interceptors;
 using Gorilla.Commons.Utility.Core;
+using MoMoney.Service.Infrastructure.Threading;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {

@@ -2,7 +2,6 @@ using Castle.Core.Interceptor;
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Service.Contracts.Infrastructure.Transactions;
 using MoMoney.Service.Infrastructure.Eventing;
-using MoMoney.Service.Infrastructure.Transactions;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {

@@ -1,7 +1,6 @@
 using Gorilla.Commons.Infrastructure;
 using Gorilla.Commons.Infrastructure.Cloning;
 using Gorilla.Commons.Infrastructure.Container;
-using Gorilla.Commons.Infrastructure.Transactions;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.boot.container.registration.proxy_configuration;

@@ -1,5 +1,4 @@
 using Gorilla.Commons.Infrastructure;
-using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Infrastructure.Log4Net;
 using Gorilla.Commons.Infrastructure.Logging;
 using Gorilla.Commons.Utility.Core;
@@ -17,8 +16,8 @@ namespace MoMoney.boot.container.registration
 
         public void run()
         {
-            registration.singleton<IDependencyRegistration>(() => registration);
-            registration.singleton<IDependencyRegistry>(() => registration.build());
+            registration.singleton(() => registration);
+            registration.singleton(() => registration.build());
             registration.singleton<ILogFactory, Log4NetLogFactory>();
         }
     }

@@ -3,15 +3,13 @@ using System.ComponentModel;
 using System.Deployment.Application;
 using Gorilla.Commons.Infrastructure;
 using Gorilla.Commons.Infrastructure.Registries;
-using Gorilla.Commons.Infrastructure.Threading;
-using Gorilla.Commons.Infrastructure.Transactions;
 using Gorilla.Commons.Utility.Core;
+using MoMoney.DataAccess.Transactions;
 using MoMoney.Presentation.Model.Projects;
 using MoMoney.Presentation.Presenters;
 using MoMoney.Service.Infrastructure.Eventing;
 using MoMoney.Service.Infrastructure.Threading;
 using MoMoney.Service.Infrastructure.Updating;
-using MoMoney.Tasks.infrastructure.updating;
 
 namespace MoMoney.boot.container.registration
 {

@@ -1,21 +1,17 @@
 using System;
-using System.Collections.Generic;
 using System.Reflection;
 using Gorilla.Commons.Infrastructure;
 using Gorilla.Commons.Infrastructure.Reflection;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.boot.container.registration.proxy_configuration;
-using MoMoney.DTO;
 using MoMoney.Presentation;
 using MoMoney.Presentation.Core;
 using MoMoney.Presentation.Model.Menu.File;
 using MoMoney.Presentation.Model.Menu.Help;
 using MoMoney.Presentation.Model.Menu.window;
 using MoMoney.Presentation.Presenters;
-using MoMoney.Presentation.Presenters.Commands;
 using MoMoney.Presentation.Views;
-using MoMoney.Service.Contracts.Application;
 
 namespace MoMoney.boot.container.registration
 {

@@ -3,13 +3,6 @@ using System.Windows.Forms;
 using Gorilla.Commons.Infrastructure;
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Presentation.Views;
-using MoMoney.Presentation.Views.billing;
-using MoMoney.Presentation.Views.dialogs;
-using MoMoney.Presentation.Views.Menu;
-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

@@ -1,6 +1,6 @@
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.windows.ui
+namespace MoMoney.boot
 {
     class hookup
     {

@@ -1,5 +1,4 @@
 using Gorilla.Commons.Infrastructure;
-using Gorilla.Commons.Infrastructure.Threading;
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Modules.Core;
 using MoMoney.Service.Infrastructure.Threading;

@@ -8,14 +8,13 @@ using System.Threading;
 using System.Windows.Forms;
 using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Infrastructure.Logging;
-using Gorilla.Commons.Infrastructure.Threading;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.boot.container;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Presentation.Presenters;
 using MoMoney.Service.Infrastructure.Eventing;
-using MoMoney.windows.ui;
+using MoMoney.Service.Infrastructure.Threading;
 
 namespace MoMoney.boot
 {

@@ -1,7 +1,6 @@
 using MoMoney.Presentation.Model.Menu;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Presentation.Presenters;
-using MoMoney.Presentation.Presenters.Menu;
 using MoMoney.Service.Infrastructure.Eventing;
 
 namespace MoMoney.Modules

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

@@ -1,7 +1,6 @@
 using MoMoney.Presentation;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Presentation.Presenters;
-using MoMoney.Presentation.Presenters.Shell;
 using MoMoney.Service.Infrastructure.Eventing;
 
 namespace MoMoney.Modules

@@ -1,6 +1,5 @@
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Presentation.Presenters;
-using MoMoney.Presentation.Presenters.Navigation;
 using MoMoney.Service.Infrastructure.Eventing;
 
 namespace MoMoney.Modules

@@ -1,7 +1,6 @@
 using MoMoney.Presentation.Model.Menu;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Presentation.Presenters;
-using MoMoney.Presentation.Presenters.Shell;
 using MoMoney.Service.Infrastructure.Eventing;
 
 namespace MoMoney.Modules

@@ -9,9 +9,6 @@
 //------------------------------------------------------------------------------
 
 namespace MoMoney.Properties {
-    using System;
-    
-    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -39,7 +36,7 @@ namespace MoMoney.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MoMoney.Properties.Resources", typeof(Resources).Assembly);
+                    var temp = new global::System.Resources.ResourceManager("MoMoney.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

@@ -1,8 +1,8 @@
 using Db4objects.Db4o;
 using Db4objects.Db4o.Config;
 using Gorilla.Commons.Infrastructure.FileSystem;
-using Gorilla.Commons.Infrastructure.Transactions;
 using Gorilla.Commons.Utility.Extensions;
+using MoMoney.DataAccess.Transactions;
 
 namespace MoMoney.DataAccess.Db40
 {

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Db4objects.Db4o;
-using Gorilla.Commons.Infrastructure.Transactions;
+using MoMoney.DataAccess.Transactions;
 
 namespace MoMoney.DataAccess.Db40
 {

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Gorilla.Commons.Infrastructure.Transactions;
+using MoMoney.DataAccess.Transactions;
 using MoMoney.Domain.accounting;
 using MoMoney.Domain.repositories;
 

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Gorilla.Commons.Infrastructure.Transactions;
+using MoMoney.DataAccess.Transactions;
 using MoMoney.Domain.Accounting;
 using MoMoney.Domain.repositories;
 

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Gorilla.Commons.Infrastructure.Transactions;
 using Gorilla.Commons.Utility.Extensions;
+using MoMoney.DataAccess.Transactions;
 using MoMoney.Domain.Accounting;
 using MoMoney.Domain.repositories;
 

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Gorilla.Commons.Infrastructure.Transactions;
+using MoMoney.DataAccess.Transactions;
 using MoMoney.Domain.Accounting;
 using MoMoney.Domain.repositories;
 

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Gorilla.Commons.Infrastructure.Transactions;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 

@@ -1,6 +1,5 @@
 using System;
 using Gorilla.Commons.Infrastructure.Container;
-using Gorilla.Commons.Infrastructure.Transactions;
 using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.DataAccess.Transactions

@@ -1,6 +1,5 @@
 using System;
 using developwithpassion.bdd.contexts;
-using Gorilla.Commons.Infrastructure.Transactions;
 using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Core;
 

@@ -1,6 +1,5 @@
 using System;
 using developwithpassion.bdd.contexts;
-using Gorilla.Commons.Infrastructure.Transactions;
 using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Core;
 

@@ -1,6 +1,6 @@
 using System.Collections;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public class Context : IContext
     {

@@ -1,4 +1,4 @@
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface IContextFactory
     {

@@ -2,30 +2,32 @@ using System.Collections;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public class ContextFactorySpecs
     {
-    }
-
-    [Concern(typeof (ContextFactory))]
-    public class when_creating_a_new_context : concerns_for<IContextFactory, ContextFactory>
-    {
-        context c = () =>
-                        {
-                            scope = an<IScopedStorage>();
-                            storage = an<IDictionary>();
+        [Concern(typeof (ContextFactory))]
+        public class when_creating_a_new_context : concerns_for<IContextFactory, ContextFactory>
+        {
+            context c = () =>
+            {
+                scope = an<IScopedStorage>();
+                storage = an<IDictionary>();
 
-                            when_the(scope).is_told_to(x => x.provide_storage()).it_will_return(storage);
-                        };
+                when_the(scope).is_told_to(x => x.provide_storage()).it_will_return(storage);
+            };
 
-        because b = () => { result = sut.create_for(scope); };
+            because b = () =>
+            {
+                result = sut.create_for(scope);
+            };
 
-        it should_return_a_context_that_represents_the_specified_scope =
-            () => result.should_be_an_instance_of<Context>();
+            it should_return_a_context_that_represents_the_specified_scope =
+                () => result.should_be_an_instance_of<Context>();
 
-        static IDictionary storage;
-        static IScopedStorage scope;
-        static IContext result;
+            static IDictionary storage;
+            static IScopedStorage scope;
+            static IContext result;
+        }
     }
 }
\ No newline at end of file

@@ -1,6 +1,6 @@
 using System.Threading;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public class CurrentThread : IThread
     {

@@ -1,7 +1,7 @@
 using System;
 using Gorilla.Commons.Utility.Core;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface IChangeTracker : IDisposable
     {

@@ -1,7 +1,7 @@
 using System;
 using Gorilla.Commons.Utility.Core;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface IChangeTrackerFactory
     {

@@ -1,4 +1,4 @@
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface IContext
     {

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using Gorilla.Commons.Utility.Core;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface IDatabase
     {

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface IDatabaseConnection : IDisposable
     {

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using Gorilla.Commons.Utility.Core;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public class IdentityMapProxy<Key, Value> : IIdentityMap<Key, Value> where Value : IIdentifiable<Guid>
     {

@@ -1,7 +1,7 @@
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     [Concern(typeof (IdentityMap<,>))]
     public class behaves_like_identity_map : concerns_for<IIdentityMap<int, string>, IdentityMap<int, string>>
@@ -18,10 +18,10 @@ namespace Gorilla.Commons.Infrastructure.Transactions
         it should_return_the_item_that_was_added_for_the_given_key = () => result.should_be_equal_to("1");
 
         because b = () =>
-                        {
-                            sut.add(1, "1");
-                            result = sut.item_that_belongs_to(1);
-                        };
+        {
+            sut.add(1, "1");
+            result = sut.item_that_belongs_to(1);
+        };
 
         static string result;
     }
@@ -43,10 +43,10 @@ namespace Gorilla.Commons.Infrastructure.Transactions
         it should_return_true = () => result.should_be_true();
 
         because b = () =>
-                        {
-                            sut.add(10, "10");
-                            result = sut.contains_an_item_for(10);
-                        };
+        {
+            sut.add(10, "10");
+            result = sut.contains_an_item_for(10);
+        };
 
         static bool result;
     }
@@ -69,11 +69,11 @@ namespace Gorilla.Commons.Infrastructure.Transactions
         it should_replace_the_old_item_with_the_new_one = () => result.should_be_equal_to("7");
 
         because b = () =>
-                        {
-                            sut.add(6, "6");
-                            sut.update_the_item_for(6, "7");
-                            result = sut.item_that_belongs_to(6);
-                        };
+        {
+            sut.add(6, "6");
+            sut.update_the_item_for(6, "7");
+            result = sut.item_that_belongs_to(6);
+        };
 
         static string result;
     }
@@ -85,10 +85,10 @@ namespace Gorilla.Commons.Infrastructure.Transactions
         it should_add_the_new_item = () => result.should_be_equal_to("3");
 
         because b = () =>
-                        {
-                            sut.update_the_item_for(3, "3");
-                            result = sut.item_that_belongs_to(3);
-                        };
+        {
+            sut.update_the_item_for(3, "3");
+            result = sut.item_that_belongs_to(3);
+        };
 
         static string result;
     }

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface IIdentityMap<TKey, TValue>
     {

@@ -1,6 +1,6 @@
 using System.Collections;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface IKey<T>
     {

@@ -1,6 +1,6 @@
 using System.Collections;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface IScopedStorage
     {

@@ -1,4 +1,4 @@
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface IStatement
     {

@@ -1,7 +1,7 @@
 using System;
 using Gorilla.Commons.Utility.Core;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface IStatementRegistry
     {

@@ -1,4 +1,4 @@
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface IThread
     {

@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public class PerThread : IContext
     {
@@ -39,14 +39,14 @@ namespace Gorilla.Commons.Infrastructure.Transactions
         {
             var id = Thread.CurrentThread.ManagedThreadId;
             within_lock(() =>
-                            {
-                                if (!slots.ContainsKey(id))
-                                {
-                                    var slot = Thread.GetNamedDataSlot(GetType().FullName);
-                                    slots.Add(id, slot);
-                                    Thread.SetData(slot, new Hashtable());
-                                }
-                            });
+            {
+                if (!slots.ContainsKey(id))
+                {
+                    var slot = Thread.GetNamedDataSlot(GetType().FullName);
+                    slots.Add(id, slot);
+                    Thread.SetData(slot, new Hashtable());
+                }
+            });
             return (IDictionary) Thread.GetData(slots[id]);
         }
 

@@ -1,6 +1,6 @@
 using System.Collections;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public class PerThreadScopedStorage : IScopedStorage
     {

@@ -1,27 +1,24 @@
-using System;
 using System.Collections;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public class PerThreadScopedStorageSpecs
     {
-    }
 
     [Concern(typeof (PerThreadScopedStorage))]
     public class when_retrieving_the_storage_for_a_specific_thread :
         concerns_for<IScopedStorage, PerThreadScopedStorage>
     {
         context c = () =>
-                        {
-                            thread_id = DateTime.Now.Ticks;
-                            thread = the_dependency<IThread>();
-                            storage = new Hashtable();
-                            when_the(thread)
-                                .is_told_to(x => x.provide_slot_for<Hashtable>())
-                                .it_will_return(storage);
-                        };
+        {
+            thread = the_dependency<IThread>();
+            storage = new Hashtable();
+            when_the(thread)
+                .is_told_to(x => x.provide_slot_for<Hashtable>())
+                .it_will_return(storage);
+        };
 
         because b = () => { result = sut.provide_storage(); };
 
@@ -29,7 +26,7 @@ namespace Gorilla.Commons.Infrastructure.Transactions
 
         static IDictionary result;
         static IThread thread;
-        static long thread_id;
         static Hashtable storage;
     }
+    }
 }
\ No newline at end of file

@@ -5,7 +5,7 @@ using Gorilla.Commons.Infrastructure.Logging;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface ISession : IDisposable
     {

@@ -1,6 +1,6 @@
 using Gorilla.Commons.Utility.Core;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface ISessionFactory : IFactory<ISession>
     {

@@ -1,7 +1,7 @@
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public class SessionFactorySpecs
     {

@@ -1,6 +1,6 @@
 using System;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public class SessionNotStartedException : Exception
     {

@@ -1,4 +1,4 @@
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface ISessionProvider
     {

@@ -4,175 +4,178 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Core;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public class SessionSpecs
     {
-    }
-
-    public class behaves_like_session : concerns_for<ISession, Session>
-    {
-        context c = () =>
-                        {
-                            transaction = the_dependency<ITransaction>();
-                            database = the_dependency<IDatabase>();
-                        };
-
-        static protected ITransaction transaction;
-        static protected IDatabase database;
-    }
-
-    [Concern(typeof (Session))]
-    public class when_saving_a_transient_item_to_a_session : behaves_like_session
-    {
-        it should_add_the_entity_to_the_identity_map = () => map.was_told_to(x => x.add(guid, entity));
-
-        context c = () =>
-                        {
-                            guid = Guid.NewGuid();
-                            entity = an<ITestEntity>();
-                            map = an<IIdentityMap<Guid, ITestEntity>>();
-
-                            when_the(entity).is_told_to(x => x.id).it_will_return(guid);
-                            when_the(transaction).is_told_to(x => x.create_for<ITestEntity>()).it_will_return(map);
-                        };
-
-        because b = () => sut.save(entity);
-
-        static ITestEntity entity;
-        static IIdentityMap<Guid, ITestEntity> map;
-        static Id<Guid> guid;
-    }
-
-    [Concern(typeof (Session))]
-    public class when_commiting_the_changes_made_in_a_session : behaves_like_session
-    {
-        it should_commit_all_the_changes_from_the_running_transaction =
-            () => transaction.was_told_to(x => x.commit_changes());
-
-        it should_not_rollback_any_changes_from_the_running_transaction =
-            () => transaction.was_not_told_to(x => x.rollback_changes());
-
-        because b = () =>
-                        {
-                            sut.flush();
-                            sut.Dispose();
-                        };
-    }
-
-    [Concern(typeof (Session))]
-    public class when_closing_a_session_before_flushing_the_changes : behaves_like_session
-    {
-        it should_rollback_any_changes_made_in_the_current_transaction =
-            () => transaction.was_told_to(x => x.rollback_changes());
-
-        because b = () => sut.Dispose();
-    }
-
-    [Concern(typeof (Session))]
-    public class when_loading_all_instances_of_a_certain_type_and_some_have_already_been_loaded : behaves_like_session
-    {
-        it should_return_the_items_from_the_cache = () => results.should_contain(cached_item);
-
-        it should_exclude_duplicates_from_the_database = () => results.should_not_contain(database_item);
-
-        it should_add_items_from_the_database_to_the_identity_map =
-            () => identity_map.was_told_to(x => x.add(id_of_the_uncached_item, uncached_item));
-
-        context c = () =>
-                        {
-                            id = Guid.NewGuid();
-                            id_of_the_uncached_item = Guid.NewGuid();
-                            identity_map = an<IIdentityMap<Guid, ITestEntity>>();
-                            cached_item = an<ITestEntity>();
-                            database_item = an<ITestEntity>();
-                            uncached_item = an<ITestEntity>();
-
-                            when_the(cached_item).is_told_to(x => x.id).it_will_return(id);
-                            when_the(database_item).is_told_to(x => x.id).it_will_return(id);
-                            when_the(uncached_item).is_told_to(x => x.id).it_will_return(id_of_the_uncached_item);
-                            when_the(transaction).is_told_to(x => x.create_for<ITestEntity>()).it_will_return( identity_map);
-                            when_the(identity_map).is_told_to(x => x.contains_an_item_for(id)).it_will_return(true);
-                            when_the(identity_map).is_told_to(x => x.all()).it_will_return(cached_item);
-                            when_the(database).is_told_to(x => x.fetch_all<ITestEntity>())
-                                .it_will_return(database_item, uncached_item);
-                        };
-
-        because b = () =>
-                        {
-                            sut.find<ITestEntity>(id);
-                            results = sut.all<ITestEntity>();
-                        };
-
-        static IEnumerable<ITestEntity> results;
-        static Id<Guid> id;
-        static Id<Guid> id_of_the_uncached_item;
-        static ITestEntity cached_item;
-        static ITestEntity database_item;
-        static IIdentityMap<Guid, ITestEntity> identity_map;
-        static ITestEntity uncached_item;
-    }
-
-    [Concern(typeof (Session))]
-    public class when_looking_up_a_specific_entity_by_its_id_and_it_has_not_been_loaded_into_the_cache :
-        behaves_like_session
-    {
-        it should_return_that_item = () => { result.should_be_equal_to(correct_item); };
-
-        it should_add_that_item_to_the_identity_map = () => map.was_told_to(x => x.add(id, correct_item));
-
-        context c = () =>
-                        {
-                            id = Guid.NewGuid();
-                            wrong_item = an<ITestEntity>();
-                            correct_item = an<ITestEntity>();
-                            map = an<IIdentityMap<Guid, ITestEntity>>();
-                            when_the(wrong_item).is_told_to(x => x.id).it_will_return<Id<Guid>>(Guid.NewGuid());
-                            when_the(correct_item).is_told_to(x => x.id).it_will_return(id);
-                            when_the(database)
-                                .is_told_to(x => x.fetch_all<ITestEntity>())
-                                .it_will_return(wrong_item, correct_item);
-                            when_the(transaction).is_told_to(x => x.create_for<ITestEntity>())
-                                .it_will_return(map);
-                        };
-
-        because b = () => { result = sut.find<ITestEntity>(id); };
-
-        static Id<Guid> id;
-        static IIdentifiable<Guid> result;
-        static ITestEntity correct_item;
-        static ITestEntity wrong_item;
-        static IIdentityMap<Guid, ITestEntity> map;
-    }
-
-    [Concern(typeof (Session))]
-    public class when_deleting_an_item_from_the_database : behaves_like_session
-    {
-        it should_remove_that_item_from_the_cache = () => map.was_told_to(x => x.evict(id));
-
-        context c = () =>
-                        {
-                            id = Guid.NewGuid();
-                            entity = an<ITestEntity>();
-                            map = an<IIdentityMap<Guid, ITestEntity>>();
-
-                            when_the(entity).is_told_to(x => x.id).it_will_return(id);
-                            when_the(transaction).is_told_to(x => x.create_for<ITestEntity>()).it_will_return(map);
-                            when_the(database).is_told_to(x => x.fetch_all<ITestEntity>()).it_will_return(entity);
-                        };
-
-        because b = () =>
-                        {
-                            sut.find<ITestEntity>(id);
-                            sut.delete(entity);
-                        };
-
-        static Id<Guid> id;
-        static IIdentityMap<Guid, ITestEntity> map;
-        static ITestEntity entity;
-    }
-
-    public interface ITestEntity : IIdentifiable<Guid>
-    {
+        public class behaves_like_session : concerns_for<ISession, Session>
+        {
+            context c = () =>
+            {
+                transaction = the_dependency<ITransaction>();
+                database = the_dependency<IDatabase>();
+            };
+
+            static protected ITransaction transaction;
+            static protected IDatabase database;
+        }
+
+        [Concern(typeof (Session))]
+        public class when_saving_a_transient_item_to_a_session : behaves_like_session
+        {
+            it should_add_the_entity_to_the_identity_map = () => map.was_told_to(x => x.add(guid, entity));
+
+            context c = () =>
+            {
+                guid = Guid.NewGuid();
+                entity = an<ITestEntity>();
+                map = an<IIdentityMap<Guid, ITestEntity>>();
+
+                when_the(entity).is_told_to(x => x.id).it_will_return(guid);
+                when_the(transaction).is_told_to(x => x.create_for<ITestEntity>()).it_will_return(map);
+            };
+
+            because b = () => sut.save(entity);
+
+            static ITestEntity entity;
+            static IIdentityMap<Guid, ITestEntity> map;
+            static Id<Guid> guid;
+        }
+
+        [Concern(typeof (Session))]
+        public class when_commiting_the_changes_made_in_a_session : behaves_like_session
+        {
+            it should_commit_all_the_changes_from_the_running_transaction =
+                () => transaction.was_told_to(x => x.commit_changes());
+
+            it should_not_rollback_any_changes_from_the_running_transaction =
+                () => transaction.was_not_told_to(x => x.rollback_changes());
+
+            because b = () =>
+            {
+                sut.flush();
+                sut.Dispose();
+            };
+        }
+
+        [Concern(typeof (Session))]
+        public class when_closing_a_session_before_flushing_the_changes : behaves_like_session
+        {
+            it should_rollback_any_changes_made_in_the_current_transaction =
+                () => transaction.was_told_to(x => x.rollback_changes());
+
+            because b = () => sut.Dispose();
+        }
+
+        [Concern(typeof (Session))]
+        public class when_loading_all_instances_of_a_certain_type_and_some_have_already_been_loaded : behaves_like_session
+        {
+            it should_return_the_items_from_the_cache = () => results.should_contain(cached_item);
+
+            it should_exclude_duplicates_from_the_database = () => results.should_not_contain(database_item);
+
+            it should_add_items_from_the_database_to_the_identity_map =
+                () => identity_map.was_told_to(x => x.add(id_of_the_uncached_item, uncached_item));
+
+            context c = () =>
+            {
+                id = Guid.NewGuid();
+                id_of_the_uncached_item = Guid.NewGuid();
+                identity_map = an<IIdentityMap<Guid, ITestEntity>>();
+                cached_item = an<ITestEntity>();
+                database_item = an<ITestEntity>();
+                uncached_item = an<ITestEntity>();
+
+                when_the(cached_item).is_told_to(x => x.id).it_will_return(id);
+                when_the(database_item).is_told_to(x => x.id).it_will_return(id);
+                when_the(uncached_item).is_told_to(x => x.id).it_will_return(id_of_the_uncached_item);
+                when_the(transaction).is_told_to(x => x.create_for<ITestEntity>()).it_will_return(identity_map);
+                when_the(identity_map).is_told_to(x => x.contains_an_item_for(id)).it_will_return(true);
+                when_the(identity_map).is_told_to(x => x.all()).it_will_return(cached_item);
+                when_the(database).is_told_to(x => x.fetch_all<ITestEntity>())
+                    .it_will_return(database_item, uncached_item);
+            };
+
+            because b = () =>
+            {
+                sut.find<ITestEntity>(id);
+                results = sut.all<ITestEntity>();
+            };
+
+            static IEnumerable<ITestEntity> results;
+            static Id<Guid> id;
+            static Id<Guid> id_of_the_uncached_item;
+            static ITestEntity cached_item;
+            static ITestEntity database_item;
+            static IIdentityMap<Guid, ITestEntity> identity_map;
+            static ITestEntity uncached_item;
+        }
+
+        [Concern(typeof (Session))]
+        public class when_looking_up_a_specific_entity_by_its_id_and_it_has_not_been_loaded_into_the_cache :
+            behaves_like_session
+        {
+            it should_return_that_item = () =>
+            {
+                result.should_be_equal_to(correct_item);
+            };
+
+            it should_add_that_item_to_the_identity_map = () => map.was_told_to(x => x.add(id, correct_item));
+
+            context c = () =>
+            {
+                id = Guid.NewGuid();
+                wrong_item = an<ITestEntity>();
+                correct_item = an<ITestEntity>();
+                map = an<IIdentityMap<Guid, ITestEntity>>();
+                when_the(wrong_item).is_told_to(x => x.id).it_will_return<Id<Guid>>(Guid.NewGuid());
+                when_the(correct_item).is_told_to(x => x.id).it_will_return(id);
+                when_the(database)
+                    .is_told_to(x => x.fetch_all<ITestEntity>())
+                    .it_will_return(wrong_item, correct_item);
+                when_the(transaction).is_told_to(x => x.create_for<ITestEntity>())
+                    .it_will_return(map);
+            };
+
+            because b = () =>
+            {
+                result = sut.find<ITestEntity>(id);
+            };
+
+            static Id<Guid> id;
+            static IIdentifiable<Guid> result;
+            static ITestEntity correct_item;
+            static ITestEntity wrong_item;
+            static IIdentityMap<Guid, ITestEntity> map;
+        }
+
+        [Concern(typeof (Session))]
+        public class when_deleting_an_item_from_the_database : behaves_like_session
+        {
+            it should_remove_that_item_from_the_cache = () => map.was_told_to(x => x.evict(id));
+
+            context c = () =>
+            {
+                id = Guid.NewGuid();
+                entity = an<ITestEntity>();
+                map = an<IIdentityMap<Guid, ITestEntity>>();
+
+                when_the(entity).is_told_to(x => x.id).it_will_return(id);
+                when_the(transaction).is_told_to(x => x.create_for<ITestEntity>()).it_will_return(map);
+                when_the(database).is_told_to(x => x.fetch_all<ITestEntity>()).it_will_return(entity);
+            };
+
+            because b = () =>
+            {
+                sut.find<ITestEntity>(id);
+                sut.delete(entity);
+            };
+
+            static Id<Guid> id;
+            static IIdentityMap<Guid, ITestEntity> map;
+            static ITestEntity entity;
+        }
+
+        public interface ITestEntity : IIdentifiable<Guid> {}
     }
 }
\ No newline at end of file

@@ -1,6 +1,6 @@
 using System.Collections;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public class SingletonScopedStorage : IScopedStorage
     {

@@ -1,7 +1,7 @@
 using System;
 using Gorilla.Commons.Utility.Core;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public class StatementRegistry : IStatementRegistry
     {

@@ -1,7 +1,7 @@
 using System.Reflection;
 using Gorilla.Commons.Infrastructure.Logging;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface ITrackerEntry<T>
     {

@@ -1,7 +1,7 @@
 using Gorilla.Commons.Infrastructure.Cloning;
 using Gorilla.Commons.Utility.Core;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface ITrackerEntryMapper<T> : IMapper<T, ITrackerEntry<T>>
     {

@@ -4,7 +4,7 @@ using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public class TrackerEntrySpecs
     {
@@ -55,11 +55,11 @@ namespace Gorilla.Commons.Infrastructure.Transactions
         because b = () => { result = sut.has_changes(); };
 
         context c = () =>
-                        {
-                            var id = Guid.NewGuid();
-                            original = new Pillow("green", id);
-                            current = new Pillow(null, id);
-                        };
+        {
+            var id = Guid.NewGuid();
+            original = new Pillow("green", id);
+            current = new Pillow(null, id);
+        };
 
         public override ITrackerEntry<Pillow> create_sut()
         {
@@ -80,11 +80,11 @@ namespace Gorilla.Commons.Infrastructure.Transactions
         because b = () => { result = sut.has_changes(); };
 
         context c = () =>
-                        {
-                            var id = Guid.NewGuid();
-                            original = new Pillow("green", id);
-                            current = new Pillow("green", id);
-                        };
+        {
+            var id = Guid.NewGuid();
+            original = new Pillow("green", id);
+            current = new Pillow("green", id);
+        };
 
         public override ITrackerEntry<Pillow> create_sut()
         {

@@ -4,7 +4,7 @@ using System.Linq;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public interface ITransaction
     {

@@ -3,7 +3,7 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Core;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public class TransactionSpecs
     {
@@ -13,10 +13,10 @@ namespace Gorilla.Commons.Infrastructure.Transactions
     public class behaves_like_transaction : concerns_for<ITransaction, Transaction>
     {
         context c = () =>
-                        {
-                            database = the_dependency<IDatabase>();
-                            factory = the_dependency<IChangeTrackerFactory>();
-                        };
+        {
+            database = the_dependency<IDatabase>();
+            factory = the_dependency<IChangeTrackerFactory>();
+        };
 
         static protected IDatabase database;
         static protected IChangeTrackerFactory factory;
@@ -36,24 +36,24 @@ namespace Gorilla.Commons.Infrastructure.Transactions
     public class when_committing_a_transaction_and_an_item_in_the_identity_map_has_changed : behaves_like_transaction
     {
         it should_commit_the_changes_to_that_item =
-            () => tracker.was_told_to<IChangeTracker<IMovie>>(x => x.commit_to(database));
+            () => tracker.was_told_to(x => x.commit_to(database));
 
         context c = () =>
-                        {
-                            movie = new Movie("Goldeneye");
-                            tracker = an<IChangeTracker<IMovie>>();
+        {
+            movie = new Movie("Goldeneye");
+            tracker = an<IChangeTracker<IMovie>>();
 
-                            when_the(factory).is_told_to(x => x.create_for<IMovie>()).it_will_return(tracker);
-                            when_the(tracker).is_told_to(x => x.is_dirty()).it_will_return(true);
-                        };
+            when_the(factory).is_told_to(x => x.create_for<IMovie>()).it_will_return(tracker);
+            when_the(tracker).is_told_to(x => x.is_dirty()).it_will_return(true);
+        };
 
 
         because b = () =>
-                        {
-                            sut.create_for<IMovie>().add(movie.id, movie);
-                            movie.change_name_to("Austin Powers");
-                            sut.commit_changes();
-                        };
+        {
+            sut.create_for<IMovie>().add(movie.id, movie);
+            movie.change_name_to("Austin Powers");
+            sut.commit_changes();
+        };
 
         static IMovie movie;
         static IChangeTracker<IMovie> tracker;
@@ -67,21 +67,21 @@ namespace Gorilla.Commons.Infrastructure.Transactions
         it should_delete_all_items_marked_for_deletion = () => tracker.was_told_to(x => x.commit_to(database));
 
         context c = () =>
-                        {
-                            movie = new Movie("Goldeneye");
-                            tracker = an<IChangeTracker<IMovie>>();
+        {
+            movie = new Movie("Goldeneye");
+            tracker = an<IChangeTracker<IMovie>>();
 
-                            when_the(factory).is_told_to(x => x.create_for<IMovie>()).it_will_return(tracker);
-                            when_the(tracker).is_told_to(x => x.is_dirty()).it_will_return(true);
-                        };
+            when_the(factory).is_told_to(x => x.create_for<IMovie>()).it_will_return(tracker);
+            when_the(tracker).is_told_to(x => x.is_dirty()).it_will_return(true);
+        };
 
         because b = () =>
-                        {
-                            var map = sut.create_for<IMovie>();
-                            map.add(movie.id, movie);
-                            map.evict(movie.id);
-                            sut.commit_changes();
-                        };
+        {
+            var map = sut.create_for<IMovie>();
+            map.add(movie.id, movie);
+            map.evict(movie.id);
+            sut.commit_changes();
+        };
 
         static IMovie movie;
         static IChangeTracker<IMovie> tracker;

@@ -1,6 +1,6 @@
 using System.Collections;
 
-namespace Gorilla.Commons.Infrastructure.Transactions
+namespace MoMoney.DataAccess.Transactions
 {
     public class TypedKey<T> : IKey<T>
     {

@@ -1,5 +1,5 @@
 using Gorilla.Commons.Infrastructure.FileSystem;
-using Gorilla.Commons.Infrastructure.Transactions;
+using MoMoney.DataAccess.Transactions;
 
 namespace MoMoney.DataAccess
 {

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Gorilla.Commons.Infrastructure.FileSystem;
-using Gorilla.Commons.Infrastructure.Transactions;
 using Gorilla.Commons.Utility.Core;
+using MoMoney.DataAccess.Transactions;
 
 namespace MoMoney.DataAccess
 {

@@ -36,7 +36,7 @@ namespace MoMoney.Domain.accounting
                                                                      };
 
         it should_not_return_any_entries_that_were_not_posted_for_that_month =
-            () => Assertions.should_not_contain(result, april_first);
+            () => result.should_not_contain(april_first);
 
         context c = () =>
                         {

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

@@ -1,4 +1,4 @@
-using MoMoney.Presentation.Views.Core;
+using MoMoney.Presentation.Views;
 
 namespace MoMoney.Presentation.Core
 {

@@ -1,4 +1,4 @@
-using MoMoney.Presentation.Views.Core;
+using MoMoney.Presentation.Views;
 
 namespace MoMoney.Presentation.Core
 {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Model.file_system
+namespace MoMoney.Presentation.Model.FileSystem
 {
     public interface IFolder
     {

@@ -2,7 +2,7 @@ using Gorilla.Commons.Infrastructure.Logging;
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Presentation.Model.Projects;
 
-namespace MoMoney.Presentation.Model.Menu.File.Commands
+namespace MoMoney.Presentation.Model.Menu.File
 {
     public interface ICloseCommand : ICommand, ISaveChangesCallback, ILoggable
     {

@@ -1,7 +1,7 @@
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Presentation.Views;
 
-namespace MoMoney.Presentation.Model.Menu.File.Commands
+namespace MoMoney.Presentation.Model.Menu.File
 {
     public interface ICloseWindowCommand : ICommand
     {

@@ -3,7 +3,7 @@ using MoMoney.Presentation.Core;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Service.Infrastructure.Eventing;
 
-namespace MoMoney.Presentation.Model.Menu.File.Commands
+namespace MoMoney.Presentation.Model.Menu.File
 {
     public interface IExitCommand : ICommand, ISaveChangesCallback
     {

@@ -4,7 +4,7 @@ using MoMoney.Presentation.Core;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Service.Infrastructure.Eventing;
 
-namespace MoMoney.Presentation.Model.Menu.File.Commands
+namespace MoMoney.Presentation.Model.Menu.File
 {
     [Concern(typeof (ExitCommand))]
     public abstract class behaves_like_exit_command : concerns_for<IExitCommand>
@@ -15,11 +15,11 @@ namespace MoMoney.Presentation.Model.Menu.File.Commands
         }
 
         context c = () =>
-                        {
-                            application = the_dependency<IApplication>();
-                            broker = the_dependency<IEventAggregator>();
-                            save_changes_command = the_dependency<ISaveChangesCommand>();
-                        };
+        {
+            application = the_dependency<IApplication>();
+            broker = the_dependency<IEventAggregator>();
+            save_changes_command = the_dependency<ISaveChangesCommand>();
+        };
 
         protected static IApplication application;
         protected static IEventAggregator broker;

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using MoMoney.Presentation.Model.Menu.File.Commands;
 using MoMoney.Presentation.Model.Projects;
 using MoMoney.Presentation.Winforms.Keyboard;
 using MoMoney.Presentation.Winforms.Resources;

@@ -1,7 +1,7 @@
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Presentation.Model.Projects;
 
-namespace MoMoney.Presentation.Model.Menu.File.Commands
+namespace MoMoney.Presentation.Model.Menu.File
 {
     public interface INewCommand : ICommand, ISaveChangesCallback
     {

@@ -2,16 +2,16 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 using MoMoney.Presentation.Model.Projects;
 
-namespace MoMoney.Presentation.Model.Menu.File.Commands
+namespace MoMoney.Presentation.Model.Menu.File
 {
     [Concern(typeof (NewCommand))]
     public abstract class behaves_like_new_command : concerns_for<INewCommand, NewCommand>
     {
         context c = () =>
-                        {
-                            current_project = the_dependency<IProjectController>();
-                            save_changes_command = the_dependency<ISaveChangesCommand>();
-                        };
+        {
+            current_project = the_dependency<IProjectController>();
+            save_changes_command = the_dependency<ISaveChangesCommand>();
+        };
 
         protected static IProjectController current_project;
         protected static ISaveChangesCommand save_changes_command;

@@ -1,8 +1,8 @@
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Presentation.Model.Projects;
-using MoMoney.Presentation.Views.dialogs;
+using MoMoney.Presentation.Views;
 
-namespace MoMoney.Presentation.Model.Menu.File.Commands
+namespace MoMoney.Presentation.Model.Menu.File
 {
     public interface IOpenCommand : ICommand, ISaveChangesCallback
     {

@@ -2,19 +2,19 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Infrastructure.FileSystem;
 using Gorilla.Commons.Testing;
 using MoMoney.Presentation.Model.Projects;
-using MoMoney.Presentation.Views.dialogs;
+using MoMoney.Presentation.Views;
 
-namespace MoMoney.Presentation.Model.Menu.File.Commands
+namespace MoMoney.Presentation.Model.Menu.File
 {
     [Concern(typeof (OpenCommand))]
     public abstract class behaves_like_command_to_open_a_project : concerns_for<IOpenCommand, OpenCommand>
     {
         context c = () =>
-                        {
-                            view = the_dependency<ISelectFileToOpenDialog>();
-                            project = the_dependency<IProjectController>();
-                            save_changes_command = the_dependency<ISaveChangesCommand>();
-                        };
+        {
+            view = the_dependency<ISelectFileToOpenDialog>();
+            project = the_dependency<IProjectController>();
+            save_changes_command = the_dependency<ISaveChangesCommand>();
+        };
 
         protected static IProjectController project;
         protected static ISelectFileToOpenDialog view;
@@ -37,10 +37,10 @@ namespace MoMoney.Presentation.Model.Menu.File.Commands
             () => project.was_told_to(x => x.open_project_from(file_path));
 
         context c = () =>
-                        {
-                            file_path = "blah_blah";
-                            when_the(view).is_told_to(x => x.tell_me_the_path_to_the_file()).it_will_return(file_path);
-                        };
+        {
+            file_path = "blah_blah";
+            when_the(view).is_told_to(x => x.tell_me_the_path_to_the_file()).it_will_return(file_path);
+        };
 
         because b = () => sut.saved();
 
@@ -54,10 +54,10 @@ namespace MoMoney.Presentation.Model.Menu.File.Commands
             () => project.was_told_to(x => x.open_project_from(file_path));
 
         context c = () =>
-                        {
-                            file_path = "blah_blah";
-                            when_the(view).is_told_to(x => x.tell_me_the_path_to_the_file()).it_will_return(file_path);
-                        };
+        {
+            file_path = "blah_blah";
+            when_the(view).is_told_to(x => x.tell_me_the_path_to_the_file()).it_will_return(file_path);
+        };
 
         because b = () => sut.not_saved();
 
@@ -72,10 +72,10 @@ namespace MoMoney.Presentation.Model.Menu.File.Commands
             () => project.was_not_told_to(x => x.open_project_from(file_path));
 
         context c = () =>
-                        {
-                            file_path = "blah_blah";
-                            when_the(view).is_told_to(x => x.tell_me_the_path_to_the_file()).it_will_return(file_path);
-                        };
+        {
+            file_path = "blah_blah";
+            when_the(view).is_told_to(x => x.tell_me_the_path_to_the_file()).it_will_return(file_path);
+        };
 
         because b = () => sut.cancelled();
 

@@ -1,8 +1,8 @@
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Presentation.Model.Projects;
-using MoMoney.Presentation.Views.dialogs;
+using MoMoney.Presentation.Views;
 
-namespace MoMoney.Presentation.Model.Menu.File.Commands
+namespace MoMoney.Presentation.Model.Menu.File
 {
     public interface ISaveAsCommand : ICommand
     {

@@ -2,9 +2,9 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Infrastructure.FileSystem;
 using Gorilla.Commons.Testing;
 using MoMoney.Presentation.Model.Projects;
-using MoMoney.Presentation.Views.dialogs;
+using MoMoney.Presentation.Views;
 
-namespace MoMoney.Presentation.Model.Menu.File.Commands
+namespace MoMoney.Presentation.Model.Menu.File
 {
     [Concern(typeof (SaveAsCommand))]
     public class when_saving_the_current_project_to_a_new_file_path : concerns_for<ISaveAsCommand, SaveAsCommand>
@@ -12,13 +12,13 @@ namespace MoMoney.Presentation.Model.Menu.File.Commands
         it should_save_the_current_project_to_the_new_path = () => current_project.was_told_to(x => x.save_project_to(new_path));
 
         context c = () =>
-                        {
-                            current_project = an<IProjectController>();
-                            view = an<ISelectFileToSaveToDialog>();
-                            new_path = "blah_blah";
+        {
+            current_project = an<IProjectController>();
+            view = an<ISelectFileToSaveToDialog>();
+            new_path = "blah_blah";
 
-                            when_the(view).is_told_to(x => x.tell_me_the_path_to_the_file()).it_will_return(new_path);
-                        };
+            when_the(view).is_told_to(x => x.tell_me_the_path_to_the_file()).it_will_return(new_path);
+        };
 
         because b = () => sut.run();
 

@@ -2,9 +2,9 @@ using System;
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Presentation.Core;
 using MoMoney.Presentation.Model.Projects;
-using MoMoney.Presentation.Views.dialogs;
+using MoMoney.Presentation.Views;
 
-namespace MoMoney.Presentation.Model.Menu.File.Commands
+namespace MoMoney.Presentation.Model.Menu.File
 {
     public interface ISaveChangesCommand : IParameterizedCommand<ISaveChangesCallback>
     {

@@ -1,7 +1,7 @@
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Presentation.Model.Projects;
 
-namespace MoMoney.Presentation.Model.Menu.File.Commands
+namespace MoMoney.Presentation.Model.Menu.File
 {
     public interface ISaveCommand : ICommand
     {

@@ -2,7 +2,7 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 using MoMoney.Presentation.Model.Projects;
 
-namespace MoMoney.Presentation.Model.Menu.File.Commands
+namespace MoMoney.Presentation.Model.Menu.File
 {
     [Concern(typeof (SaveCommand))]
     public abstract class behaves_like_the_save_command : concerns_for<ISaveCommand, SaveCommand>
@@ -13,10 +13,10 @@ namespace MoMoney.Presentation.Model.Menu.File.Commands
         }
 
         context c = () =>
-                        {
-                            current_project = an<IProjectController>();
-                            save_as_command = an<ISaveAsCommand>();
-                        };
+        {
+            current_project = an<IProjectController>();
+            save_as_command = an<ISaveAsCommand>();
+        };
         protected static ISaveAsCommand save_as_command;
         protected static IProjectController current_project;
     }

@@ -1,8 +1,7 @@
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Presentation.Presenters;
-using MoMoney.Presentation.Presenters.Menu.Help;
 
-namespace MoMoney.Presentation.Model.Menu.Help.commands
+namespace MoMoney.Presentation.Model.Menu.Help
 {
     public interface IDisplayInformationAboutTheApplication : ICommand
     {

@@ -1,9 +1,5 @@
-using System;
 using System.Collections.Generic;
-using MoMoney.Presentation.Model.Menu.Help.commands;
 using MoMoney.Presentation.Presenters;
-using MoMoney.Presentation.Presenters.Shell;
-using MoMoney.Presentation.Presenters.updates;
 using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Model.Menu.Help

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using MoMoney.Presentation.Model.Menu.File.Commands;
+using MoMoney.Presentation.Model.Menu.File;
 using MoMoney.Presentation.Winforms.Resources;
 
 namespace MoMoney.Presentation.Model.Menu.window

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

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

@@ -4,8 +4,8 @@ using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Service.Contracts.Infrastructure;
+using MoMoney.Service.Contracts.Infrastructure.Transactions;
 using MoMoney.Service.Infrastructure.Eventing;
-using MoMoney.Service.Infrastructure.Transactions;
 
 namespace MoMoney.Presentation.Model.Projects
 {

@@ -5,8 +5,8 @@ using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Service.Contracts.Infrastructure;
+using MoMoney.Service.Contracts.Infrastructure.Transactions;
 using MoMoney.Service.Infrastructure.Eventing;
-using MoMoney.Service.Infrastructure.Transactions;
 
 namespace MoMoney.Presentation.Model.Projects
 {
@@ -34,7 +34,6 @@ namespace MoMoney.Presentation.Model.Projects
         context c = () =>
                         {
                             file_to_update = an<IFile>();
-                            current_file = an<IFile>();
                             when_the(file_to_update).is_told_to(x => x.does_the_file_exist()).it_will_return(true);
                         };
 
@@ -45,7 +44,6 @@ namespace MoMoney.Presentation.Model.Projects
                         };
 
         static IFile file_to_update;
-        static IFile current_file;
     }
 
     public class when_attempting_to_save_the_changes_to_a_project_and_a_file_to_save_to_has_not_been_specified :

@@ -1,7 +1,7 @@
 using MoMoney.Presentation.Core;
-using MoMoney.Presentation.Views.Menu;
+using MoMoney.Presentation.Views;
 
-namespace MoMoney.Presentation.Presenters.Menu.Help
+namespace MoMoney.Presentation.Presenters
 {
     public interface IAboutApplicationPresenter : IContentPresenter
     {

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

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using MoMoney.DTO;
 using MoMoney.Presentation.Core;
-using MoMoney.Presentation.Views.billing;
+using MoMoney.Presentation.Views;
 using MoMoney.Service.Contracts.Application;
 
-namespace MoMoney.Presentation.Presenters.billing
+namespace MoMoney.Presentation.Presenters
 {
     public interface IAddBillPaymentPresenter : IContentPresenter
     {

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

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

@@ -5,17 +5,17 @@ using MoMoney.DTO;
 using MoMoney.Presentation.Views;
 using MoMoney.Service.Contracts.Application;
 
-namespace MoMoney.Presentation.Presenters.income
+namespace MoMoney.Presentation.Presenters
 {
     [Concern(typeof (AddNewIncomePresenter))]
     public abstract class behaves_like_add_new_income_presenter :
         concerns_for<IAddNewIncomePresenter, AddNewIncomePresenter>
     {
         context c = () =>
-                        {
-                            view = the_dependency<IAddNewIncomeView>();
-                            pump = the_dependency<ICommandPump>();
-                        };
+        {
+            view = the_dependency<IAddNewIncomeView>();
+            pump = the_dependency<ICommandPump>();
+        };
 
         static protected ICommandPump pump;
         static protected IAddNewIncomeView view;

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using MoMoney.DTO;
-using MoMoney.Presentation.Presenters.Navigation;
 using MoMoney.Presentation.Views;
 using MoMoney.Presentation.Winforms.Resources;
 using MoMoney.Service.Contracts.Application;

@@ -2,9 +2,9 @@ using System.Windows.Forms;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Presentation.Core;
 using MoMoney.Presentation.Model.Menu;
-using MoMoney.Presentation.Views.Shell;
+using MoMoney.Presentation.Views;
 
-namespace MoMoney.Presentation.Presenters.Menu
+namespace MoMoney.Presentation.Presenters
 {
     public interface IApplicationMenuPresenter : IPresenter
     {

@@ -1,10 +1,10 @@
 using MoMoney.Presentation.Core;
-using MoMoney.Presentation.Model.Menu.File.Commands;
+using MoMoney.Presentation.Model.Menu.File;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Presentation.Views;
 using MoMoney.Service.Infrastructure.Eventing;
 
-namespace MoMoney.Presentation.Presenters.Shell
+namespace MoMoney.Presentation.Presenters
 {
     public interface IApplicationShellPresenter : IPresenter, IEventSubscriber<ClosingProjectEvent>
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Presentation.Presenters.Navigation
+namespace MoMoney.Presentation.Presenters
 {
     public class Build
     {

@@ -3,13 +3,10 @@ using Gorilla.Commons.Utility;
 using Gorilla.Commons.Utility.Core;
 using MoMoney.DTO;
 using MoMoney.Presentation.Core;
-using MoMoney.Presentation.Presenters.Commands;
-using MoMoney.Presentation.Views.updates;
+using MoMoney.Presentation.Views;
 using MoMoney.Service.Contracts.Infrastructure.Updating;
-using MoMoney.Service.Infrastructure.Updating;
-using MoMoney.Tasks.infrastructure.updating;
 
-namespace MoMoney.Presentation.Presenters.updates
+namespace MoMoney.Presentation.Presenters
 {
     public interface ICheckForUpdatesPresenter : IPresenter, ICallback<Percent>
     {

@@ -3,23 +3,20 @@ using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility;
 using Gorilla.Commons.Utility.Core;
 using MoMoney.DTO;
-using MoMoney.Presentation.Presenters.Commands;
-using MoMoney.Presentation.Views.updates;
+using MoMoney.Presentation.Views;
 using MoMoney.Service.Contracts.Infrastructure.Updating;
-using MoMoney.Service.Infrastructure.Updating;
-using MoMoney.Tasks.infrastructure.updating;
 
-namespace MoMoney.Presentation.Presenters.updates
+namespace MoMoney.Presentation.Presenters
 {
     [Concern(typeof (CheckForUpdatesPresenter))]
     public abstract class behaves_like_check_for_updates_presenter :
         concerns_for<ICheckForUpdatesPresenter, CheckForUpdatesPresenter>
     {
         context c = () =>
-                        {
-                            view = the_dependency<ICheckForUpdatesView>();
-                            pump = the_dependency<ICommandPump>();
-                        };
+        {
+            view = the_dependency<ICheckForUpdatesView>();
+            pump = the_dependency<ICommandPump>();
+        };
 
         static protected ICheckForUpdatesView view;
         static protected ICommandPump pump;

@@ -1,6 +1,5 @@
-using Gorilla.Commons.Infrastructure.Threading;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Presentation.Presenters.Commands;
+using MoMoney.Service.Infrastructure.Threading;
 
 namespace MoMoney.Presentation.Presenters
 {

@@ -1,8 +1,8 @@
 using System;
-using MoMoney.Presentation.Views.Startup;
+using MoMoney.Presentation.Views;
 using MoMoney.Service.Infrastructure.Threading;
 
-namespace MoMoney.Presentation.Presenters.Startup
+namespace MoMoney.Presentation.Presenters
 {
     public class display_the_splash_screen : ISplashScreenState
     {