Commit 2f3dd3f

@@ -1,10 +1,10 @@
 using System;
 using System.Linq.Expressions;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container.registration.mapping
 {
-    public interface IMap<Input, Output> : IMapper<Input, Output>
+    public interface IMap<Input, Output> : Mapper<Input, Output>
     {
         void add(IMappingStep<Input, Output> step);
 

@@ -1,6 +1,6 @@
 using System;
 using System.Reflection;
-using Gorilla.Commons.Utility.Extensions;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container.registration.mapping
 {
@@ -9,9 +9,6 @@ namespace MoMoney.boot.container.registration.mapping
         public const string exception_message_format = "The property [{0}] on the target type [{1}] is immutable";
 
         public ImmutablePropertyException(Type target, PropertyInfo property)
-            : base(exception_message_format.formatted_using(property.Name, target.Name))
-
-        {
-        }
+            : base(exception_message_format.formatted_using(property.Name, target.Name)) {}
     }
 }
\ No newline at end of file

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using Gorilla.Commons.Utility.Extensions;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container.registration.mapping
 {
@@ -11,15 +11,11 @@ namespace MoMoney.boot.container.registration.mapping
         readonly IList<IMappingStep<Input, Output>> mapping_steps;
         readonly IMappingStepFactory mapping_step_factory;
 
-        public Map() : this(new MappingStepFactory())
-        {
-        }
+        public Map() : this(new MappingStepFactory()) {}
 
         public Map(IMappingStepFactory mapping_step_factory)
             : this(
-                new MissingInitializationStep<Output>(), new List<IMappingStep<Input, Output>>(), mapping_step_factory)
-        {
-        }
+                new MissingInitializationStep<Output>(), new List<IMappingStep<Input, Output>>(), mapping_step_factory) {}
 
         public Map(IMapInitializationStep<Output> map_initialization_step,
                    IList<IMappingStep<Input, Output>> mapping_steps, IMappingStepFactory mapping_step_factory)

@@ -1,4 +1,4 @@
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.utility;
 using MoMoney.Domain.Accounting;
 using MoMoney.DTO;
 
@@ -6,7 +6,7 @@ namespace MoMoney.boot.container.registration.mapping
 {
     public class Mappers
     {
-        static public IMapper<IBill, BillInformationDTO> bill_mapper =
+        static public Mapper<IBill, BillInformationDTO> bill_mapper =
             new Map<IBill, BillInformationDTO>()
                 .initialize_mapping_using(() => new BillInformationDTO())
                 .map(x => x.company_to_pay.name, y => y.company_name)

@@ -1,5 +1,5 @@
 using System;
-using Gorilla.Commons.Utility.Extensions;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container.registration.mapping
 {
@@ -11,9 +11,6 @@ namespace MoMoney.boot.container.registration.mapping
                                            string property_that_could_not_be_found)
             : base(
                 exception_message_format.formatted_using(property_that_could_not_be_found,
-                                                         type_that_did_not_have_the_property.Name))
-
-        {
-        }
+                                                         type_that_did_not_have_the_property.Name)) {}
     }
 }
\ No newline at end of file

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-using Gorilla.Commons.Utility.Extensions;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container.registration.mapping
 {

@@ -1,13 +1,13 @@
 using Castle.Core.Interceptor;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {
     public class InterceptingFilter : IInterceptor
     {
-        readonly ISpecification<IInvocation> condition;
+        readonly Specification<IInvocation> condition;
 
-        public InterceptingFilter(ISpecification<IInvocation> condition)
+        public InterceptingFilter(Specification<IInvocation> condition)
         {
             this.condition = condition;
         }

@@ -1,16 +1,16 @@
 using Castle.Core.Interceptor;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {
     public interface IInterceptingFilterFactory
     {
-        IInterceptor create_for(ISpecification<IInvocation> specification);
+        IInterceptor create_for(Specification<IInvocation> specification);
     }
 
     public class InterceptingFilterFactory : IInterceptingFilterFactory
     {
-        public IInterceptor create_for(ISpecification<IInvocation> specification)
+        public IInterceptor create_for(Specification<IInvocation> specification)
         {
             return new InterceptingFilter(specification);
         }

@@ -1,7 +1,7 @@
 using Castle.Core.Interceptor;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {
@@ -10,17 +10,23 @@ namespace MoMoney.boot.container.registration.proxy_configuration
         public class when_creating_an_intercepting_filter :
             concerns_for<IInterceptingFilterFactory, InterceptingFilterFactory>
         {
-            context c = () => { condition = an<ISpecification<IInvocation>>(); };
+            context c = () =>
+            {
+                condition = an<Specification<IInvocation>>();
+            };
 
-            because b = () => { result = sut.create_for(condition); };
+            because b = () =>
+            {
+                result = sut.create_for(condition);
+            };
 
             it should_return_a_filter = () =>
-                                            {
-                                                result.should_not_be_null();
-                                                result.should_be_an_instance_of<InterceptingFilter>();
-                                            };
+            {
+                result.should_not_be_null();
+                result.should_be_an_instance_of<InterceptingFilter>();
+            };
 
-            static ISpecification<IInvocation> condition;
+            static Specification<IInvocation> condition;
             static IInterceptor result;
         }
     }

@@ -1,7 +1,7 @@
 using Castle.Core.Interceptor;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {
@@ -9,18 +9,21 @@ namespace MoMoney.boot.container.registration.proxy_configuration
     {
         public class when_intercepting_a_call : concerns_for<IInterceptor, InterceptingFilter>
         {
-            context c = () => { condition = the_dependency<ISpecification<IInvocation>>(); };
+            context c = () =>
+            {
+                condition = the_dependency<Specification<IInvocation>>();
+            };
 
-            static protected ISpecification<IInvocation> condition;
+            static protected Specification<IInvocation> condition;
         }
 
         public class when_a_condition_is_not_met : when_intercepting_a_call
         {
             context c = () =>
-                            {
-                                invocation = an<IInvocation>();
-                                when_the(condition).is_told_to(x => x.is_satisfied_by(invocation)).it_will_return(false);
-                            };
+            {
+                invocation = an<IInvocation>();
+                when_the(condition).is_told_to(x => x.is_satisfied_by(invocation)).it_will_return(false);
+            };
 
             because b = () => sut.Intercept(invocation);
 
@@ -32,10 +35,10 @@ namespace MoMoney.boot.container.registration.proxy_configuration
         public class when_a_condition_is_met : when_intercepting_a_call
         {
             context c = () =>
-                            {
-                                invocation = an<IInvocation>();
-                                when_the(condition).is_told_to(x => x.is_satisfied_by(invocation)).it_will_return(true);
-                            };
+            {
+                invocation = an<IInvocation>();
+                when_the(condition).is_told_to(x => x.is_satisfied_by(invocation)).it_will_return(true);
+            };
 
             because b = () => sut.Intercept(invocation);
 

@@ -1,12 +1,10 @@
-using Gorilla.Commons.Infrastructure.Castle.DynamicProxy;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.infrastructure.thirdparty.Castle.DynamicProxy;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {
-    class NoConfiguration<T> : IConfiguration<IProxyBuilder<T>>
+    class NoConfiguration<T> : Configuration<ProxyBuilder<T>>
     {
-        public void configure(IProxyBuilder<T> item)
-        {
-        }
+        public void configure(ProxyBuilder<T> item) {}
     }
 }
\ No newline at end of file

@@ -1,10 +1,12 @@
 using Castle.Core.Interceptor;
-using MoMoney.Presentation.Model.messages;
+using momoney.presentation.model.events;
 using MoMoney.Service.Infrastructure.Eventing;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {
-    public interface INotifyProgressInterceptor : IInterceptor {}
+    public interface INotifyProgressInterceptor : IInterceptor
+    {
+    }
 
     public class NotifyProgressInterceptor : INotifyProgressInterceptor
     {
@@ -17,9 +19,9 @@ namespace MoMoney.boot.container.registration.proxy_configuration
 
         public void Intercept(IInvocation invocation)
         {
-            broker.publish(new StartedRunningCommand(invocation.InvocationTarget));
+            broker.publish(new StartedRunningCommand(invocation.TargetType.Name));
             invocation.Proceed();
-            broker.publish(new FinishedRunningCommand(invocation.InvocationTarget));
+            broker.publish(new FinishedRunningCommand(invocation.TargetType.Name));
         }
     }
 }
\ No newline at end of file

@@ -2,15 +2,15 @@ using System.Security.Principal;
 using System.Threading;
 using Castle.Core.Interceptor;
 using Gorilla.Commons.Infrastructure.Logging;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {
     public class SecuringProxy : IInterceptor
     {
-        readonly ISpecification<IPrincipal> filter;
+        readonly Specification<IPrincipal> filter;
 
-        public SecuringProxy(ISpecification<IPrincipal> filter)
+        public SecuringProxy(Specification<IPrincipal> filter)
         {
             this.filter = filter;
         }

@@ -3,32 +3,33 @@ using System.Threading;
 using Castle.Core.Interceptor;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {
-    public class SecuringProxySpecs
-    {
-    }
+    public class SecuringProxySpecs {}
 
     public class when_attempting_to_perform_an_action_that_requires_authentication :
         concerns_for<SecuringProxy>
     {
-        context c = () => { filter = the_dependency<ISpecification<IPrincipal>>(); };
+        context c = () =>
+        {
+            filter = the_dependency<Specification<IPrincipal>>();
+        };
 
-        static protected ISpecification<IPrincipal> filter;
+        static protected Specification<IPrincipal> filter;
     }
 
     public class when_logged_in_as_a_user_that_belongs_to_the_proper_role :
         when_attempting_to_perform_an_action_that_requires_authentication
     {
         context c = () =>
-                        {
-                            invocation = an<IInvocation>();
-                            when_the(filter)
-                                .is_told_to(x => x.is_satisfied_by(Thread.CurrentPrincipal))
-                                .it_will_return(true);
-                        };
+        {
+            invocation = an<IInvocation>();
+            when_the(filter)
+                .is_told_to(x => x.is_satisfied_by(Thread.CurrentPrincipal))
+                .it_will_return(true);
+        };
 
         because b = () => sut.Intercept(invocation);
 
@@ -41,12 +42,12 @@ namespace MoMoney.boot.container.registration.proxy_configuration
         when_attempting_to_perform_an_action_that_requires_authentication
     {
         context c = () =>
-                        {
-                            invocation = an<IInvocation>();
-                            when_the(filter)
-                                .is_told_to(x => x.is_satisfied_by(Thread.CurrentPrincipal))
-                                .it_will_return(false);
-                        };
+        {
+            invocation = an<IInvocation>();
+            when_the(filter)
+                .is_told_to(x => x.is_satisfied_by(Thread.CurrentPrincipal))
+                .it_will_return(false);
+        };
 
         because b = () => sut.Intercept(invocation);
 

@@ -1,12 +1,11 @@
-using Gorilla.Commons.Infrastructure;
-using Gorilla.Commons.Infrastructure.Castle.DynamicProxy;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.infrastructure.thirdparty.Castle.DynamicProxy;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {
-    class ServiceLayerConfiguration<T> : IConfiguration<IProxyBuilder<T>>
+    class ServiceLayerConfiguration<T> : Configuration<ProxyBuilder<T>>
     {
-        public void configure(IProxyBuilder<T> item)
+        public void configure(ProxyBuilder<T> item)
         {
             item.add_interceptor(Lazy.load<INotifyProgressInterceptor>()).intercept_all();
             item.add_interceptor(Lazy.load<IUnitOfWorkInterceptor>()).intercept_all();

@@ -1,12 +1,12 @@
-using Gorilla.Commons.Infrastructure.Castle.DynamicProxy;
-using Gorilla.Commons.Utility.Core;
-using MoMoney.Service.Infrastructure.Threading;
+using gorilla.commons.infrastructure.thirdparty.Castle.DynamicProxy;
+using gorilla.commons.utility;
+using momoney.service.infrastructure.threading;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {
-    class SynchronizedConfiguration<T> : IConfiguration<IProxyBuilder<T>>
+    class SynchronizedConfiguration<T> : Configuration<ProxyBuilder<T>>
     {
-        public void configure(IProxyBuilder<T> item)
+        public void configure(ProxyBuilder<T> item)
         {
             item.add_interceptor<RunOnUIThread>().intercept_all();
         }

@@ -1,13 +1,12 @@
 using Castle.Core.Interceptor;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.utility;
+using momoney.service.contracts.infrastructure.transactions;
 using MoMoney.Service.Contracts.Infrastructure.Transactions;
 using MoMoney.Service.Infrastructure.Eventing;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {
-    public interface IUnitOfWorkInterceptor : IInterceptor
-    {
-    }
+    public interface IUnitOfWorkInterceptor : IInterceptor {}
 
     public class UnitOfWorkInterceptor : IUnitOfWorkInterceptor
     {
@@ -25,7 +24,7 @@ namespace MoMoney.boot.container.registration.proxy_configuration
             using (var unit_of_work = factory.create())
             {
                 invocation.Proceed();
-                broker.publish<ICallback<IUnitOfWork>>(x => x.run(unit_of_work));
+                broker.publish<Callback<IUnitOfWork>>(x => x.run(unit_of_work));
                 unit_of_work.commit();
             }
         }

@@ -1,24 +1,21 @@
 using System;
-using System.Reflection;
-using Gorilla.Commons.Infrastructure;
-using Gorilla.Commons.Infrastructure.Castle.Windsor.Configuration;
 using Gorilla.Commons.Infrastructure.Reflection;
-using Gorilla.Commons.Utility.Extensions;
+using gorilla.commons.infrastructure.thirdparty;
+using gorilla.commons.infrastructure.thirdparty.Castle.Windsor.Configuration;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container.registration
 {
     public class auto_wire_components_in_to_the : IStartupCommand
     {
-        readonly IDependencyRegistration registrar;
-        readonly IComponentExclusionSpecification exclusion_policy;
+        readonly DependencyRegistration registrar;
+        readonly ComponentExclusionSpecification exclusion_policy;
 
-        public auto_wire_components_in_to_the(IDependencyRegistration registrar)
-            : this(registrar, new ComponentExclusionSpecification())
-        {
-        }
+        public auto_wire_components_in_to_the(DependencyRegistration registrar)
+            : this(registrar, new ComponentExclusionSpecificationImplementation()) {}
 
-        public auto_wire_components_in_to_the(IDependencyRegistration registration,
-                                              IComponentExclusionSpecification exclusion_policy)
+        public auto_wire_components_in_to_the(DependencyRegistration registration,
+                                              ComponentExclusionSpecification exclusion_policy)
         {
             registrar = registration;
             this.exclusion_policy = exclusion_policy;
@@ -26,10 +23,10 @@ namespace MoMoney.boot.container.registration
 
         public void run()
         {
-            run(new ApplicationAssembly(Assembly.GetExecutingAssembly()));
+            run(new ApplicationAssembly(System.Reflection.Assembly.GetExecutingAssembly()));
         }
 
-        public void run(IAssembly item)
+        public void run(Assembly item)
         {
             item
                 .all_types()

@@ -1,8 +1,8 @@
 using System;
 using developwithpassion.bdd.contexts;
-using Gorilla.Commons.Infrastructure;
-using Gorilla.Commons.Infrastructure.Castle.Windsor.Configuration;
 using Gorilla.Commons.Infrastructure.Reflection;
+using gorilla.commons.infrastructure.thirdparty;
+using gorilla.commons.infrastructure.thirdparty.Castle.Windsor.Configuration;
 using Gorilla.Commons.Testing;
 using MbUnit.Framework;
 
@@ -13,18 +13,18 @@ namespace MoMoney.boot.container.registration
         concerns_for<IStartupCommand, auto_wire_components_in_to_the>
     {
         context c = () =>
-                        {
-                            exclusions_criteria = the_dependency<IComponentExclusionSpecification>();
-                            builder = the_dependency<IDependencyRegistration>();
-                        };
+        {
+            exclusions_criteria = the_dependency<ComponentExclusionSpecification>();
+            builder = the_dependency<DependencyRegistration>();
+        };
 
         public override IStartupCommand create_sut()
         {
             return new auto_wire_components_in_to_the(builder, exclusions_criteria);
         }
 
-        static protected IDependencyRegistration builder;
-        static protected IComponentExclusionSpecification exclusions_criteria;
+        static protected DependencyRegistration builder;
+        static protected ComponentExclusionSpecification exclusions_criteria;
     }
 
     public class when_registering_all_the_components_from_an_assembly :
@@ -40,51 +40,39 @@ namespace MoMoney.boot.container.registration
             () => builder.was_not_told_to(x => x.transient(bad_type, bad_type));
 
         context c = () =>
-                        {
-                            assembly = an<IAssembly>();
-                            interface_type = typeof (ITestComponent);
-                            component_with_multiple_interfaces = typeof (TestComponent);
-                            component_with_no_interface = typeof (ComponentNoInterface);
-                            bad_type = typeof (BadComponent);
-
-                            when_the(assembly).is_told_to(x => x.all_types())
-                                .it_will_return(component_with_multiple_interfaces, component_with_no_interface,
-                                                bad_type);
-                            when_the(exclusions_criteria).is_told_to(x => x.is_satisfied_by(bad_type))
-                                .it_will_return(false);
-                        };
+        {
+            assembly = an<Assembly>();
+            interface_type = typeof (ITestComponent);
+            component_with_multiple_interfaces = typeof (TestComponent);
+            component_with_no_interface = typeof (ComponentNoInterface);
+            bad_type = typeof (BadComponent);
+
+            when_the(assembly).is_told_to(x => x.all_types())
+                .it_will_return(component_with_multiple_interfaces, component_with_no_interface,
+                                bad_type);
+            when_the(exclusions_criteria).is_told_to(x => x.is_satisfied_by(bad_type))
+                .it_will_return(false);
+        };
 
         because b = () => sut.run(assembly);
 
 
-        static IAssembly assembly;
+        static Assembly assembly;
         static Type component_with_multiple_interfaces;
         static Type interface_type;
         static Type component_with_no_interface;
         static Type bad_type;
     }
 
-    public interface IBaseComponent
-    {
-    }
+    public interface IBaseComponent {}
 
-    public interface ITestComponent
-    {
-    }
+    public interface ITestComponent {}
 
-    public class BaseComponent : IBaseComponent
-    {
-    }
+    public class BaseComponent : IBaseComponent {}
 
-    public class TestComponent : BaseComponent, ITestComponent
-    {
-    }
+    public class TestComponent : BaseComponent, ITestComponent {}
 
-    public class ComponentNoInterface
-    {
-    }
+    public class ComponentNoInterface {}
 
-    public class BadComponent
-    {
-    }
+    public class BadComponent {}
 }
\ No newline at end of file

@@ -1,9 +1,7 @@
 using Gorilla.Commons.Infrastructure.Reflection;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container.registration
 {
-    public interface IStartupCommand : ICommand, IParameterizedCommand<IAssembly>
-    {
-    }
+    public interface IStartupCommand : Command, ParameterizedCommand<Assembly> {}
 }
\ No newline at end of file

@@ -1,22 +1,21 @@
-using Gorilla.Commons.Infrastructure;
 using Gorilla.Commons.Infrastructure.Cloning;
 using Gorilla.Commons.Infrastructure.Container;
-using Gorilla.Commons.Utility.Core;
-using Gorilla.Commons.Utility.Extensions;
+using gorilla.commons.infrastructure.thirdparty;
+using gorilla.commons.utility;
 using MoMoney.boot.container.registration.proxy_configuration;
-using MoMoney.DataAccess;
-using MoMoney.DataAccess.Db40;
-using MoMoney.DataAccess.Transactions;
+using momoney.database;
+using momoney.database.db4o;
+using momoney.database.transactions;
 using MoMoney.Service.Contracts.Infrastructure.Transactions;
 using MoMoney.Service.Infrastructure.Transactions;
 
 namespace MoMoney.boot.container.registration
 {
-    class wire_up_the_data_access_components_into_the : ICommand
+    class wire_up_the_data_access_components_into_the : Command
     {
-        readonly IDependencyRegistration register;
+        readonly DependencyRegistration register;
 
-        public wire_up_the_data_access_components_into_the(IDependencyRegistration registry)
+        public wire_up_the_data_access_components_into_the(DependencyRegistration registry)
         {
             register = registry;
         }

@@ -1,24 +1,25 @@
-using Gorilla.Commons.Infrastructure;
-using Gorilla.Commons.Infrastructure.Log4Net;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Infrastructure.Logging;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.infrastructure.thirdparty;
+using gorilla.commons.infrastructure.thirdparty.Log4Net;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container.registration
 {
-    class wire_up_the_essential_services_into_the : ICommand
+    class wire_up_the_essential_services_into_the : Command
     {
-        readonly IDependencyRegistration registration;
+        readonly DependencyRegistration registration;
 
-        public wire_up_the_essential_services_into_the(IDependencyRegistration registration)
+        public wire_up_the_essential_services_into_the(DependencyRegistration registration)
         {
             this.registration = registration;
         }
 
         public void run()
         {
-            registration.singleton(() => registration);
-            registration.singleton(() => registration.build());
-            registration.singleton<ILogFactory, Log4NetLogFactory>();
+            registration.singleton<DependencyRegistration>(() => registration);
+            registration.singleton<DependencyRegistry>(() => registration.build());
+            registration.singleton<LogFactory, Log4NetLogFactory>();
         }
     }
 }
\ No newline at end of file

@@ -1,23 +1,25 @@
 using System.Collections;
 using System.ComponentModel;
 using System.Deployment.Application;
-using Gorilla.Commons.Infrastructure;
 using Gorilla.Commons.Infrastructure.Registries;
-using Gorilla.Commons.Utility.Core;
-using MoMoney.DataAccess.Transactions;
+using gorilla.commons.infrastructure.thirdparty;
+using gorilla.commons.utility;
+using momoney.database.transactions;
 using MoMoney.Presentation.Model.Projects;
 using MoMoney.Presentation.Presenters;
 using MoMoney.Service.Infrastructure.Eventing;
+using momoney.service.infrastructure.threading;
 using MoMoney.Service.Infrastructure.Threading;
+using momoney.service.infrastructure.updating;
 using MoMoney.Service.Infrastructure.Updating;
 
 namespace MoMoney.boot.container.registration
 {
-    class wire_up_the_infrastructure_in_to_the : ICommand
+    class wire_up_the_infrastructure_in_to_the : Command
     {
-        readonly IDependencyRegistration registry;
+        readonly DependencyRegistration registry;
 
-        public wire_up_the_infrastructure_in_to_the(IDependencyRegistration registry)
+        public wire_up_the_infrastructure_in_to_the(DependencyRegistration registry)
         {
             this.registry = registry;
         }
@@ -27,10 +29,10 @@ namespace MoMoney.boot.container.registration
             registry.singleton<IEventAggregator, EventAggregator>();
             registry.singleton<ITimer, IntervalTimer>();
             registry.singleton<IProjectController, ProjectController>();
-            registry.transient(typeof (IRegistry<>), typeof (DefaultRegistry<>));
+            registry.transient(typeof (Registry<>), typeof (DefaultRegistry<>));
             registry.transient(typeof (ITrackerEntryMapper<>), typeof (TrackerEntryMapper<>));
             registry.transient(typeof (IKey<>), typeof (TypedKey<>));
-            registry.transient(typeof (IComponentFactory<>), typeof (ComponentFactory<>));
+            registry.transient(typeof (ComponentFactory<>), typeof (DefaultConstructorFactory<>));
             registry.singleton<IContext>(() => new Context(new Hashtable()));
 
             registry.singleton(() => AsyncOperationManager.SynchronizationContext);

@@ -1,40 +1,39 @@
 using System;
-using Gorilla.Commons.Infrastructure;
-using Gorilla.Commons.Utility.Core;
-using Gorilla.Commons.Utility.Extensions;
+using gorilla.commons.infrastructure.thirdparty;
+using gorilla.commons.utility;
 using MoMoney.Domain.Accounting;
 using MoMoney.DTO;
 
 namespace MoMoney.boot.container.registration
 {
-    class wire_up_the_mappers_in_to_the : ICommand
+    class wire_up_the_mappers_in_to_the : Command
     {
-        readonly IDependencyRegistration registry;
+        readonly DependencyRegistration registry;
 
-        public wire_up_the_mappers_in_to_the(IDependencyRegistration registry)
+        public wire_up_the_mappers_in_to_the(DependencyRegistration registry)
         {
             this.registry = registry;
         }
 
         public void run()
         {
-            registry.transient(typeof (IMapper<,>), typeof (Mapper<,>));
+            registry.transient(typeof (Mapper<,>), typeof (AnonymousMapper<,>));
             registry.singleton<Converter<IBill, BillInformationDTO>>(
                 () => x => new BillInformationDTO
-                               {
-                                   company_name = x.company_to_pay.name,
-                                   the_amount_owed = x.the_amount_owed.ToString(),
-                                   due_date = x.due_date.to_date_time(),
-                               });
+                           {
+                               company_name = x.company_to_pay.name,
+                               the_amount_owed = x.the_amount_owed.ToString(),
+                               due_date = x.due_date.to_date_time(),
+                           });
             registry.singleton<Converter<ICompany, CompanyDTO>>(() => x => new CompanyDTO {id = x.id, name = x.name});
 
             registry.singleton<Converter<IIncome, IncomeInformationDTO>>(
                 () => x => new IncomeInformationDTO
-                               {
-                                   amount = x.amount_tendered.to_string(),
-                                   company = x.company.to_string(),
-                                   recieved_date = x.date_of_issue.to_string(),
-                               });
+                           {
+                               amount = x.amount_tendered.to_string(),
+                               company = x.company.to_string(),
+                               recieved_date = x.date_of_issue.to_string(),
+                           });
         }
     }
 }
\ No newline at end of file

@@ -1,35 +1,34 @@
 using System;
-using System.Reflection;
-using Gorilla.Commons.Infrastructure;
 using Gorilla.Commons.Infrastructure.Reflection;
-using Gorilla.Commons.Utility.Core;
-using Gorilla.Commons.Utility.Extensions;
+using gorilla.commons.infrastructure.thirdparty;
+using gorilla.commons.infrastructure.thirdparty.Castle.DynamicProxy;
+using gorilla.commons.utility;
 using MoMoney.boot.container.registration.proxy_configuration;
 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;
 using MoMoney.Presentation.Views;
 
 namespace MoMoney.boot.container.registration
 {
-    class wire_up_the_presentation_modules : ICommand, IParameterizedCommand<IAssembly>
+    class wire_up_the_presentation_modules : Command, ParameterizedCommand<Assembly>
     {
-        readonly IDependencyRegistration registry;
+        readonly DependencyRegistration registry;
 
-        public wire_up_the_presentation_modules(IDependencyRegistration registry)
+        public wire_up_the_presentation_modules(DependencyRegistration registry)
         {
             this.registry = registry;
         }
 
         public void run()
         {
-            run(new ApplicationAssembly(Assembly.GetExecutingAssembly()));
+            run(new ApplicationAssembly(System.Reflection.Assembly.GetExecutingAssembly()));
         }
 
-        public void run(IAssembly item)
+        public void run(Assembly item)
         {
             Func<IApplicationController> target =
                 () => new ApplicationController(Lazy.load<IPresenterRegistry>(), Lazy.load<IShell>());

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using Gorilla.Commons.Infrastructure;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.infrastructure.thirdparty;
+using gorilla.commons.utility;
 using MoMoney.DTO;
 using MoMoney.Presentation.Core;
 using MoMoney.Presentation.Presenters;
@@ -10,11 +10,11 @@ using MoMoney.Service.Contracts.Application;
 
 namespace MoMoney.boot.container.registration
 {
-    class wire_up_the_reports_in_to_the : ICommand
+    class wire_up_the_reports_in_to_the : Command
     {
-        readonly IDependencyRegistration registry;
+        readonly DependencyRegistration registry;
 
-        public wire_up_the_reports_in_to_the(IDependencyRegistration registry)
+        public wire_up_the_reports_in_to_the(DependencyRegistration registry)
         {
             this.registry = registry;
         }
@@ -22,9 +22,9 @@ namespace MoMoney.boot.container.registration
         public void run()
         {
             registry.transient<IReportViewer, ReportViewer>();
-            registry.transient(typeof (IPresenter), typeof (ReportPresenter<IViewAllBillsReport,IEnumerable<BillInformationDTO>,IGetAllBillsQuery>));
+            registry.transient(typeof (IPresenter), typeof (ReportPresenter<IViewAllBillsReport, IEnumerable<BillInformationDTO>, IGetAllBillsQuery>));
             registry.transient<IViewAllBillsReport, ViewAllBillsReport>();
-            registry.transient(typeof (IPresenter), typeof (ReportPresenter<IViewAllIncomeReport,IEnumerable<IncomeInformationDTO>,IGetAllIncomeQuery>));
+            registry.transient(typeof (IPresenter), typeof (ReportPresenter<IViewAllIncomeReport, IEnumerable<IncomeInformationDTO>, IGetAllIncomeQuery>));
             registry.transient<IViewAllIncomeReport, ViewAllIncomeReport>();
         }
     }

@@ -1,5 +1,6 @@
-using Gorilla.Commons.Infrastructure;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.infrastructure.thirdparty;
+using gorilla.commons.infrastructure.thirdparty.Castle.DynamicProxy;
+using gorilla.commons.utility;
 using MoMoney.boot.container.registration.proxy_configuration;
 using MoMoney.Domain.Accounting;
 using MoMoney.Domain.repositories;
@@ -9,11 +10,11 @@ using MoMoney.Service.Contracts.Application;
 
 namespace MoMoney.boot.container.registration
 {
-    class wire_up_the_services_in_to_the : ICommand
+    class wire_up_the_services_in_to_the : Command
     {
-        readonly IDependencyRegistration registry;
+        readonly DependencyRegistration registry;
 
-        public wire_up_the_services_in_to_the(IDependencyRegistration registry)
+        public wire_up_the_services_in_to_the(DependencyRegistration registry)
         {
             this.registry = registry;
         }
@@ -28,14 +29,14 @@ namespace MoMoney.boot.container.registration
         {
             registry.proxy<IGetAllCompanysQuery, ServiceLayerConfiguration<IGetAllCompanysQuery>>(
                 () =>
-                new GetAllCompanysQuery(Lazy.load<ICompanyRepository>(), Lazy.load<IMapper<ICompany, CompanyDTO>>()));
+                new GetAllCompanysQuery(Lazy.load<ICompanyRepository>(), Lazy.load<Mapper<ICompany, CompanyDTO>>()));
             registry.proxy<IGetAllBillsQuery, ServiceLayerConfiguration<IGetAllBillsQuery>>(
                 () =>
-                new GetAllBillsQuery(Lazy.load<IBillRepository>(), Lazy.load<IMapper<IBill, BillInformationDTO>>()));
+                new GetAllBillsQuery(Lazy.load<IBillRepository>(), Lazy.load<Mapper<IBill, BillInformationDTO>>()));
             registry.proxy<IGetAllIncomeQuery, ServiceLayerConfiguration<IGetAllIncomeQuery>>(
                 () =>
                 new GetAllIncomeQuery(Lazy.load<IIncomeRepository>(),
-                                      Lazy.load<IMapper<IIncome, IncomeInformationDTO>>()));
+                                      Lazy.load<Mapper<IIncome, IncomeInformationDTO>>()));
             registry.proxy<IGetTheCurrentCustomerQuery, ServiceLayerConfiguration<IGetTheCurrentCustomerQuery>>(
                 () => new GetTheCurrentCustomerQuery(Lazy.load<IAccountHolderRepository>()));
         }
@@ -44,14 +45,14 @@ namespace MoMoney.boot.container.registration
         {
             registry.proxy<IRegisterNewCompanyCommand, ServiceLayerConfiguration<IRegisterNewCompanyCommand>>(
                 () =>
-                new RegisterNewCompanyCommand(Lazy.load<ICompanyFactory>(), Lazy.load<INotification>(),
+                new RegisterNewCompanyCommand(Lazy.load<ICompanyFactory>(), Lazy.load<Notification>(),
                                               Lazy.load<ICompanyRepository>()));
             registry.proxy<ISaveNewBillCommand, ServiceLayerConfiguration<ISaveNewBillCommand>>(
                 () => new SaveNewBillCommand(Lazy.load<ICompanyRepository>(), Lazy.load<IGetTheCurrentCustomerQuery>()));
 
             registry.proxy<IAddNewIncomeCommand, ServiceLayerConfiguration<IAddNewIncomeCommand>>(
                 () =>
-                new AddNewIncomeCommand(Lazy.load<IGetTheCurrentCustomerQuery>(), Lazy.load<INotification>(),
+                new AddNewIncomeCommand(Lazy.load<IGetTheCurrentCustomerQuery>(), Lazy.load<Notification>(),
                                         Lazy.load<IIncomeRepository>(), Lazy.load<ICompanyRepository>()));
         }
     }

@@ -1,17 +1,18 @@
 using System.ComponentModel;
 using System.Windows.Forms;
-using Gorilla.Commons.Infrastructure;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.infrastructure.thirdparty;
+using gorilla.commons.utility;
+using momoney.presentation.views;
 using MoMoney.Presentation.Views;
 using MoMoney.Presentation.Winforms.Views;
 
 namespace MoMoney.boot.container.registration
 {
-    class wire_up_the_views_in_to_the : ICommand
+    class wire_up_the_views_in_to_the : Command
     {
-        readonly IDependencyRegistration register;
+        readonly DependencyRegistration register;
 
-        public wire_up_the_views_in_to_the(IDependencyRegistration registry)
+        public wire_up_the_views_in_to_the(DependencyRegistration registry)
         {
             register = registry;
         }

@@ -1,10 +1,10 @@
 using System;
-using Gorilla.Commons.Infrastructure.Castle.Windsor.Configuration;
-using Gorilla.Commons.Utility.Extensions;
+using gorilla.commons.infrastructure.thirdparty.Castle.Windsor.Configuration;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container
 {
-    public class ComponentExclusionSpecification : IComponentExclusionSpecification
+    public class ComponentExclusionSpecificationImplementation : ComponentExclusionSpecification
     {
         public bool is_satisfied_by(Type type)
         {

@@ -3,24 +3,25 @@ using System.Collections.Generic;
 using System.Data;
 using System.Windows.Forms;
 using developwithpassion.bdd.contexts;
-using Gorilla.Commons.Infrastructure.Castle.Windsor.Configuration;
 using Gorilla.Commons.Infrastructure.Container;
+using gorilla.commons.infrastructure.thirdparty.Castle.Windsor.Configuration;
 using Gorilla.Commons.Testing;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.utility;
 using MoMoney.Domain.Core;
 
 namespace MoMoney.boot.container
 {
     public abstract class behaves_like_component_exclusion_specification :
-        concerns_for<IComponentExclusionSpecification, ComponentExclusionSpecification>
-    {
-    }
+        concerns_for<ComponentExclusionSpecification, ComponentExclusionSpecificationImplementation> {}
 
     public class when_checking_if_a_windows_form_should_be_excluded : behaves_like_component_exclusion_specification
     {
         it should_be_excluded = () => result.should_be_true();
 
-        because b = () => { result = sut.is_satisfied_by(typeof (FakeForm)); };
+        because b = () =>
+        {
+            result = sut.is_satisfied_by(typeof (FakeForm));
+        };
 
         static bool result;
     }
@@ -30,7 +31,10 @@ namespace MoMoney.boot.container
     {
         it should_be_excluded = () => result.should_be_true();
 
-        because b = () => { result = sut.is_satisfied_by(typeof (FakeDependencyRegistry)); };
+        because b = () =>
+        {
+            result = sut.is_satisfied_by(typeof (FakeDependencyRegistry));
+        };
 
         static bool result;
     }
@@ -39,7 +43,10 @@ namespace MoMoney.boot.container
     {
         it should_be_excluded = () => result.should_be_true();
 
-        because b = () => { result = sut.is_satisfied_by(typeof (FakeStaticClass)); };
+        because b = () =>
+        {
+            result = sut.is_satisfied_by(typeof (FakeStaticClass));
+        };
 
         static bool result;
     }
@@ -48,7 +55,10 @@ namespace MoMoney.boot.container
     {
         it should_be_excluded = () => result.should_be_true();
 
-        because b = () => { result = sut.is_satisfied_by(typeof (FakeEntity)); };
+        because b = () =>
+        {
+            result = sut.is_satisfied_by(typeof (FakeEntity));
+        };
 
         static bool result;
     }
@@ -57,31 +67,30 @@ namespace MoMoney.boot.container
     {
         it should_be_excluded = () => result.should_be_true();
 
-        because b = () => { result = sut.is_satisfied_by(typeof (IDbConnection)); };
+        because b = () =>
+        {
+            result = sut.is_satisfied_by(typeof (IDbConnection));
+        };
 
         static bool result;
     }
 
-    public class FakeForm : Form
-    {
-    }
+    public class FakeForm : Form {}
 
-    public class FakeDependencyRegistry : IDependencyRegistry
+    public class FakeDependencyRegistry : DependencyRegistry
     {
         public Interface get_a<Interface>()
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<Interface> all_the<Interface>()
+        public IEnumerable<Contract> get_all<Contract>()
         {
             throw new NotImplementedException();
         }
     }
 
-    static public class FakeStaticClass
-    {
-    }
+    static public class FakeStaticClass {}
 
     public class FakeEntity : IEntity
     {

@@ -1,9 +1,9 @@
 using Gorilla.Commons.Infrastructure.Container;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.utility;
 
 namespace MoMoney.boot.container
 {
-    class tear_down_the_container : ICommand
+    class tear_down_the_container : Command
     {
         public void run()
         {

@@ -1,39 +1,39 @@
 using System;
 using System.Windows.Forms;
 using Gorilla.Commons.Infrastructure.Container;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.utility;
 using MoMoney.Domain.Core;
 
 namespace MoMoney.boot.container
 {
     static public class type_extensions
     {
-        static public ISpecification<Type> has_no_interfaces(this Type item)
+        static public Specification<Type> has_no_interfaces(this Type item)
         {
             return new PredicateSpecification<Type>(x => x.GetInterfaces().Length == 0);
         }
 
-        static public ISpecification<Type> subclasses_form(this Type item)
+        static public Specification<Type> subclasses_form(this Type item)
         {
             return new PredicateSpecification<Type>(x => typeof (Form).IsAssignableFrom(x));
         }
 
-        static public ISpecification<Type> is_an_implementation_of_dependency_registry(this Type item)
+        static public Specification<Type> is_an_implementation_of_dependency_registry(this Type item)
         {
-            return new PredicateSpecification<Type>(x => typeof (IDependencyRegistry).IsAssignableFrom(x));
+            return new PredicateSpecification<Type>(x => typeof (DependencyRegistry).IsAssignableFrom(x));
         }
 
-        static public ISpecification<Type> is_an_entity(this Type item)
+        static public Specification<Type> is_an_entity(this Type item)
         {
             return new PredicateSpecification<Type>(x => typeof (IEntity).IsAssignableFrom(x));
         }
 
-        static public ISpecification<Type> is_an_interface(this Type item)
+        static public Specification<Type> is_an_interface(this Type item)
         {
             return new PredicateSpecification<Type>(x => x.IsInterface);
         }
 
-        static public ISpecification<Type> is_abstract(this Type item)
+        static public Specification<Type> is_abstract(this Type item)
         {
             return new PredicateSpecification<Type>(x => x.IsAbstract);
         }

@@ -1,21 +1,18 @@
-using Gorilla.Commons.Infrastructure;
-using Gorilla.Commons.Infrastructure.Autofac;
 using Gorilla.Commons.Infrastructure.Container;
-using Gorilla.Commons.Utility.Core;
-using Gorilla.Commons.Utility.Extensions;
+using gorilla.commons.infrastructure.thirdparty;
+using gorilla.commons.infrastructure.thirdparty.Autofac;
+using gorilla.commons.utility;
 using MoMoney.boot.container.registration;
 
 namespace MoMoney.boot.container
 {
-    class wire_up_the_container : ICommand
+    class wire_up_the_container : Command
     {
-        readonly IDependencyRegistration registry;
+        readonly DependencyRegistration registry;
 
-        public wire_up_the_container() : this(new AutofacDependencyRegistryBuilder())
-        {
-        }
+        public wire_up_the_container() : this(new AutofacDependencyRegistryBuilder()) {}
 
-        public wire_up_the_container(IDependencyRegistration registry)
+        public wire_up_the_container(DependencyRegistration registry)
         {
             this.registry = registry;
         }

@@ -1,10 +1,10 @@
 using System;
+using gorilla.commons.Utility;
 using MoMoney.Presentation.Presenters;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.boot
 {
-    public class display_the_splash_screen : IDisposableCommand
+    public class display_the_splash_screen : DisposableCommand
     {
         readonly Func<ISplashScreenPresenter> presenter;
 

@@ -2,14 +2,13 @@ using System;
 using System.Windows.Forms;
 using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Infrastructure.Logging;
-using Gorilla.Commons.Utility.Core;
-using Gorilla.Commons.Utility.Extensions;
-using MoMoney.Presentation.Model.messages;
+using gorilla.commons.utility;
+using momoney.presentation.model.events;
 using MoMoney.Service.Infrastructure.Eventing;
 
 namespace MoMoney.boot
 {
-    class global_error_handling : ICommand
+    class global_error_handling : Command
     {
         public void run()
         {

@@ -1,10 +1,8 @@
-using Gorilla.Commons.Utility.Core;
-
-namespace MoMoney.boot
+namespace momoney.boot
 {
     class hookup
     {
-        static public Command the<Command>() where Command : ICommand, new()
+        static public Command the<Command>() where Command : gorilla.commons.utility.Command, new()
         {
             return new Command();
         }

@@ -1,20 +1,19 @@
-using Gorilla.Commons.Infrastructure;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.infrastructure.thirdparty.Castle.DynamicProxy;
+using gorilla.commons.utility;
 using MoMoney.Modules.Core;
+using momoney.service.infrastructure.threading;
 using MoMoney.Service.Infrastructure.Threading;
 
 namespace MoMoney.boot
 {
-    class start_the_application : ICommand
+    class start_the_application : Command
     {
         readonly IBackgroundThread thread;
         readonly ILoadPresentationModulesCommand command;
         readonly ICommandProcessor processor;
 
         public start_the_application(IBackgroundThread thread)
-            : this(thread, Lazy.load<ILoadPresentationModulesCommand>(), Lazy.load<ICommandProcessor>())
-        {
-        }
+            : this(thread, Lazy.load<ILoadPresentationModulesCommand>(), Lazy.load<ICommandProcessor>()) {}
 
         public start_the_application(IBackgroundThread thread, ILoadPresentationModulesCommand command,
                                      ICommandProcessor processor)

@@ -8,17 +8,17 @@ using System.Threading;
 using System.Windows.Forms;
 using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Infrastructure.Logging;
-using Gorilla.Commons.Utility.Core;
-using Gorilla.Commons.Utility.Extensions;
+using gorilla.commons.utility;
+using momoney.boot;
 using MoMoney.boot.container;
-using MoMoney.Presentation.Model.messages;
+using momoney.presentation.model.events;
 using MoMoney.Presentation.Presenters;
 using MoMoney.Service.Infrastructure.Eventing;
-using MoMoney.Service.Infrastructure.Threading;
+using momoney.service.infrastructure.threading;
 
 namespace MoMoney.boot
 {
-    public class WindowsFormsApplication<Shell> : ICommand where Shell : Form
+    public class WindowsFormsApplication<Shell> : Command where Shell : Form
     {
         protected WindowsFormsApplication()
         {
@@ -67,9 +67,7 @@ namespace MoMoney.boot
     {
         readonly IServiceContainer container;
 
-        public ApplicationContainer() : this(new ServiceContainer())
-        {
-        }
+        public ApplicationContainer() : this(new ServiceContainer()) {}
 
         public ApplicationContainer(IServiceContainer container)
         {

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

@@ -1,5 +1,4 @@
-using Gorilla.Commons.Utility.Core;
-using Gorilla.Commons.Utility.Extensions;
+using gorilla.commons.utility;
 using MoMoney.Presentation;
 using MoMoney.Service.Infrastructure.Threading;
 
@@ -7,10 +6,10 @@ namespace MoMoney.Modules.Core
 {
     public class LoadPresentationModulesCommand : ILoadPresentationModulesCommand
     {
-        readonly IRegistry<IModule> registry;
+        readonly Registry<IModule> registry;
         readonly ICommandProcessor processor;
 
-        public LoadPresentationModulesCommand(IRegistry<IModule> registry, ICommandProcessor processor)
+        public LoadPresentationModulesCommand(Registry<IModule> registry, ICommandProcessor processor)
         {
             this.registry = registry;
             this.processor = processor;

@@ -1,6 +1,6 @@
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
-using Gorilla.Commons.Utility.Core;
+using gorilla.commons.utility;
 using MoMoney.Presentation;
 using MoMoney.Service.Infrastructure.Threading;
 
@@ -13,16 +13,16 @@ namespace MoMoney.Modules.Core
         it should_initialize_all_the_presentation_modules = () => processor.was_told_to(x => x.add(module));
 
         context c = () =>
-                        {
-                            registry = the_dependency<IRegistry<IModule>>();
-                            processor = the_dependency<ICommandProcessor>();
-                            module = an<IModule>();
-                            when_the(registry).is_told_to(r => r.all()).it_will_return(module);
-                        };
+        {
+            registry = the_dependency<Registry<IModule>>();
+            processor = the_dependency<ICommandProcessor>();
+            module = an<IModule>();
+            when_the(registry).is_told_to(r => r.all()).it_will_return(module);
+        };
 
         because b = () => sut.run();
 
-        static IRegistry<IModule> registry;
+        static Registry<IModule> registry;
         static IModule module;
         static ICommandProcessor processor;
     }

@@ -1,5 +1,6 @@
+using momoney.presentation.model.events;
 using MoMoney.Presentation.Model.Menu;
-using MoMoney.Presentation.Model.messages;
+using momoney.presentation.presenters;
 using MoMoney.Presentation.Presenters;
 using MoMoney.Service.Infrastructure.Eventing;
 

@@ -1,4 +1,5 @@
 using MoMoney.Presentation;
+using momoney.presentation.presenters;
 using MoMoney.Presentation.Presenters;
 
 namespace MoMoney.Modules

@@ -1,4 +1,4 @@
-using MoMoney.DataAccess;
+using momoney.database;
 using MoMoney.Service.Infrastructure.Eventing;
 
 namespace MoMoney.Modules

@@ -1,5 +1,6 @@
 using MoMoney.Presentation;
-using MoMoney.Presentation.Model.messages;
+using momoney.presentation.model.events;
+using momoney.presentation.presenters;
 using MoMoney.Presentation.Presenters;
 using MoMoney.Service.Infrastructure.Eventing;
 

@@ -1,5 +1,5 @@
 using MoMoney.Presentation;
-using MoMoney.Presentation.Model.messages;
+using momoney.presentation.model.events;
 using MoMoney.Service.Infrastructure.Eventing;
 
 namespace MoMoney.Modules

@@ -1,5 +1,5 @@
 using MoMoney.Presentation;
-using MoMoney.Presentation.Model.messages;
+using momoney.presentation.model.events;
 using MoMoney.Service.Infrastructure.Eventing;
 
 namespace MoMoney.Modules

@@ -1,5 +1,5 @@
 using MoMoney.Presentation;
-using MoMoney.Presentation.Model.messages;
+using momoney.presentation.model.events;
 using MoMoney.Service.Infrastructure.Eventing;
 
 namespace MoMoney.Modules

@@ -1,5 +1,5 @@
 using MoMoney.Presentation;
-using MoMoney.Presentation.Model.messages;
+using momoney.presentation.model.events;
 using MoMoney.Service.Infrastructure.Eventing;
 
 namespace MoMoney.Modules

@@ -1,4 +1,4 @@
-using MoMoney.Presentation.Model.messages;
+using momoney.presentation.model.events;
 using MoMoney.Presentation.Presenters;
 using MoMoney.Service.Infrastructure.Eventing;
 

@@ -1,4 +1,5 @@
-using MoMoney.Presentation.Model.messages;
+using momoney.presentation.model.events;
+using momoney.presentation.presenters;
 using MoMoney.Presentation.Presenters;
 using MoMoney.Service.Infrastructure.Eventing;
 

@@ -1,5 +1,6 @@
+using momoney.presentation.model.events;
 using MoMoney.Presentation.Model.Menu;
-using MoMoney.Presentation.Model.messages;
+using momoney.presentation.presenters;
 using MoMoney.Presentation.Presenters;
 using MoMoney.Service.Infrastructure.Eventing;
 

@@ -1,14 +1,17 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3082
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace MoMoney.Properties {
+namespace momoney.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -36,7 +39,7 @@ namespace MoMoney.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    var temp = new global::System.Resources.ResourceManager("MoMoney.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("momoney.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3082
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace MoMoney.Properties {
+namespace momoney.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

@@ -8,8 +8,8 @@
     <ProjectGuid>{2DB82691-BF15-4538-8C5E-6BF8F4F875A9}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MoMoney</RootNamespace>
-    <AssemblyName>MoMoney</AssemblyName>
+    <RootNamespace>momoney</RootNamespace>
+    <AssemblyName>momoney</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -47,15 +47,19 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\lib\test\developwithpassion\developwithpassion.bdd.dll</HintPath>
     </Reference>
-    <Reference Include="gorilla.commons.infrastructure, Version=2009.5.5.1633, Culture=neutral, PublicKeyToken=687787ccb6c36c9f, processorArchitecture=MSIL">
+    <Reference Include="gorilla.commons.infrastructure, Version=2009.10.21.739, Culture=neutral, PublicKeyToken=687787ccb6c36c9f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\lib\app\gorilla\gorilla.commons.infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="gorilla.commons.infrastructure.thirdparty, Version=2009.5.5.1633, Culture=neutral, PublicKeyToken=687787ccb6c36c9f, processorArchitecture=MSIL">
+    <Reference Include="gorilla.commons.infrastructure.thirdparty, Version=2009.10.21.739, Culture=neutral, PublicKeyToken=687787ccb6c36c9f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\lib\app\gorilla\gorilla.commons.infrastructure.thirdparty.dll</HintPath>
     </Reference>
-    <Reference Include="gorilla.commons.utility, Version=2009.5.5.1633, Culture=neutral, PublicKeyToken=687787ccb6c36c9f, processorArchitecture=MSIL">
+    <Reference Include="gorilla.commons.infrastructure.thirdparty.log4net, Version=2009.10.21.739, Culture=neutral, PublicKeyToken=687787ccb6c36c9f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\build\lib\app\gorilla\gorilla.commons.infrastructure.thirdparty.log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="gorilla.commons.utility, Version=2009.10.21.739, Culture=neutral, PublicKeyToken=687787ccb6c36c9f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\lib\app\gorilla\gorilla.commons.utility.dll</HintPath>
     </Reference>
@@ -158,23 +162,23 @@
     <Compile Include="boot\display_the_splash_screen.cs" />
     <Compile Include="boot\global_error_handling.cs" />
     <Compile Include="boot\WindowsFormsApplication.cs" />
-    <Compile Include="Modules\ApplicationShellModule.cs" />
-    <Compile Include="Modules\Core\ILoadPresentationModulesCommand.cs" />
-    <Compile Include="Modules\DatabaseModule.cs" />
-    <Compile Include="Modules\ApplicationMenuModule.cs" />
-    <Compile Include="Modules\IApplicationMenuModule.cs" />
-    <Compile Include="Modules\IDatabaseModule.cs" />
-    <Compile Include="Modules\IMainMenuModule.cs" />
-    <Compile Include="Modules\INavigationModule.cs" />
-    <Compile Include="Modules\IToolbarModule.cs" />
-    <Compile Include="Modules\MainMenuModule.cs" />
-    <Compile Include="Modules\NavigationModule.cs" />
-    <Compile Include="Modules\GettingStartedModule.cs" />
-    <Compile Include="Modules\GettingStartedModuleSpecs.cs" />
-    <Compile Include="Modules\ToolbarModule.cs" />
-    <Compile Include="Modules\Core\LoadPresentationModulesCommandSpecs.cs" />
+    <Compile Include="modules\ApplicationShellModule.cs" />
+    <Compile Include="modules\core\ILoadPresentationModulesCommand.cs" />
+    <Compile Include="modules\DatabaseModule.cs" />
+    <Compile Include="modules\ApplicationMenuModule.cs" />
+    <Compile Include="modules\IApplicationMenuModule.cs" />
+    <Compile Include="modules\IDatabaseModule.cs" />
+    <Compile Include="modules\IMainMenuModule.cs" />
+    <Compile Include="modules\INavigationModule.cs" />
+    <Compile Include="modules\IToolbarModule.cs" />
+    <Compile Include="modules\MainMenuModule.cs" />
+    <Compile Include="modules\NavigationModule.cs" />
+    <Compile Include="modules\GettingStartedModule.cs" />
+    <Compile Include="modules\GettingStartedModuleSpecs.cs" />
+    <Compile Include="modules\ToolbarModule.cs" />
+    <Compile Include="modules\core\LoadPresentationModulesCommandSpecs.cs" />
     <Compile Include="boot\hookup.cs" />
-    <Compile Include="Modules\Core\LoadPresentationModulesCommand.cs" />
+    <Compile Include="modules\core\LoadPresentationModulesCommand.cs" />
     <Compile Include="bootstrap.cs" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -203,29 +207,29 @@
     <Compile Include="boot\container\registration\wire_up_the_views_in_to_the.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DataAccess\DataAccess.csproj">
+    <ProjectReference Include="..\database\database.csproj">
       <Project>{580E68A8-EDEE-4350-8BBE-A053645B0F83}</Project>
-      <Name>DataAccess</Name>
+      <Name>database</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Domain\Domain.csproj">
+    <ProjectReference Include="..\Domain\domain.csproj">
       <Project>{BE790BCC-4412-473F-9D0A-5AA48FE7A74F}</Project>
-      <Name>Domain</Name>
+      <Name>domain</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DTO\DTO.csproj">
+    <ProjectReference Include="..\DTO\dto.csproj">
       <Project>{ACF52FAB-435B-48C9-A383-C787CB2D8000}</Project>
-      <Name>DTO</Name>
+      <Name>dto</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Presentation\Presentation.csproj">
+    <ProjectReference Include="..\Presentation\presentation.csproj">
       <Project>{D7C83DB3-492D-4514-8C53-C57AD8E7ACE7}</Project>
-      <Name>Presentation</Name>
+      <Name>presentation</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Service\Service.csproj">
+    <ProjectReference Include="..\Service\service.csproj">
       <Project>{7EA4C557-6EF2-4B1F-85C8-5B3F51BAD8DB}</Project>
-      <Name>Service</Name>
+      <Name>service</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Service.Contracts\Service.Contracts.csproj">
+    <ProjectReference Include="..\Service.Contracts\service.contracts.csproj">
       <Project>{41D2B68B-031B-44FF-BAC5-7752D9E29F94}</Project>
-      <Name>Service.Contracts</Name>
+      <Name>service.contracts</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

@@ -1,91 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using Db4objects.Db4o;
-using developwithpassion.bdd.contexts;
-using Gorilla.Commons.Testing;
-using Gorilla.Commons.Utility.Extensions;
-
-namespace MoMoney.DataAccess.db40.spiking
-{
-    [Concern(typeof (Db4oFactory))]
-    public class when_opening_an_existing_database_ : concerns
-    {
-        before_each_observation be = () => { };
-
-        context c = () =>
-                        {
-                            original = new TestObject(88, "mo");
-                            the_database_file = Path.GetTempFileName();
-                            var configuration = Db4oFactory.NewConfiguration();
-                            configuration.LockDatabaseFile(false);
-                            database = Db4oFactory.OpenFile(configuration, the_database_file);
-                        };
-
-        because b = () =>
-                        {
-                            database.Store(original);
-                            database.Close();
-                            database.Dispose();
-                            database = Db4oFactory.OpenFile(the_database_file);
-                            results = database.Query<ITestObject>().databind();
-                        };
-
-        it should_be_able_to_load_the_original_contents = () => results.should_contain(original);
-
-        it they_should_be_equal = () => new TestObject(99, "gretzky").Equals(new TestObject(99, "gretzky"));
-
-        it should_only_contain_the_original_item = () => results.Count.should_be_equal_to(1);
-
-        after_each_observation ae = () =>
-                                        {
-                                            database.Close();
-                                            database.Dispose();
-                                        };
-
-        static ITestObject original;
-        static string the_database_file;
-        static IList<ITestObject> results;
-        static IObjectContainer database;
-    }
-
-    public interface ITestObject
-    {
-        int Id { get; }
-        string Name { get; }
-    }
-
-    public class TestObject : ITestObject
-    {
-        public TestObject(int id, string name)
-        {
-            Id = id;
-            Name = name;
-        }
-
-        public int Id { get; private set; }
-        public string Name { get; private set; }
-
-        public bool Equals(TestObject obj)
-        {
-            if (ReferenceEquals(null, obj)) return false;
-            if (ReferenceEquals(this, obj)) return true;
-            return obj.Id == Id && Equals(obj.Name, Name);
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (ReferenceEquals(null, obj)) return false;
-            if (ReferenceEquals(this, obj)) return true;
-            if (obj.GetType() != typeof (TestObject)) return false;
-            return Equals((TestObject) obj);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                return (Id*397) ^ (Name != null ? Name.GetHashCode() : 0);
-            }
-        }
-    }
-}
\ No newline at end of file

@@ -1,20 +0,0 @@
-using Db4objects.Db4o.Config;
-using Gorilla.Commons.Utility.Core;
-
-namespace MoMoney.DataAccess.Db40
-{
-    public interface IConfigureDatabaseStep : IConfiguration<IConfiguration>
-    {
-    }
-
-    public class ConfigureDatabaseStep : IConfigureDatabaseStep
-    {
-        public void configure(IConfiguration item)
-        {
-            item.LockDatabaseFile(false);
-            //item.UpdateDepth(10);
-            //item.WeakReferences(true);
-            //item.AutomaticShutDown(true);
-        }
-    }
-}
\ No newline at end of file

@@ -1,22 +0,0 @@
-using Db4objects.Db4o;
-using Db4objects.Db4o.Events;
-using Gorilla.Commons.Infrastructure.Logging;
-using Gorilla.Commons.Utility.Core;
-
-namespace MoMoney.DataAccess.Db40
-{
-    public interface IConfigureObjectContainerStep : IConfiguration<IObjectContainer>
-    {
-    }
-
-    public class ConfigureObjectContainerStep : IConfigureObjectContainerStep
-    {
-        public void configure(IObjectContainer item)
-        {
-            var registry = EventRegistryFactory.ForObjectContainer(item);
-            registry.ClassRegistered += (sender, args) => this.log().debug("class registered: {0}", args.ClassMetadata());
-            registry.Instantiated += (sender, args) => this.log().debug("class instantiated: {0}", args.Object.GetType().Name);
-            registry.Committed += (sender, args) => this.log().debug("added: {0}, updated: {1}, deleted: {2}", args.Added, args.Updated, args.Deleted);
-        }
-    }
-}
\ No newline at end of file

@@ -1,34 +0,0 @@
-using Db4objects.Db4o;
-using Db4objects.Db4o.Config;
-using Gorilla.Commons.Infrastructure.FileSystem;
-using Gorilla.Commons.Utility.Extensions;
-using MoMoney.DataAccess.Transactions;
-
-namespace MoMoney.DataAccess.Db40
-{
-    public class ConnectionFactory : IConnectionFactory
-    {
-        readonly IConfigureDatabaseStep setup;
-        readonly IConfigureObjectContainerStep setup_container;
-
-        public ConnectionFactory(IConfigureDatabaseStep setup, IConfigureObjectContainerStep setup_container)
-        {
-            this.setup = setup;
-            this.setup_container = setup_container;
-        }
-
-        public IDatabaseConnection open_connection_to(IFile the_path_to_the_database_file)
-        {
-            var configuration = Db4oFactory.NewConfiguration();
-            setup.configure(configuration);
-            return new DatabaseConnection(get_container(the_path_to_the_database_file, configuration));
-        }
-
-        IObjectContainer get_container(IFile the_path_to_the_database_file, IConfiguration configuration)
-        {
-            return Db4oFactory
-                .OpenFile(configuration, the_path_to_the_database_file.path)
-                .and_configure_with(setup_container);
-        }
-    }
-}
\ No newline at end of file