Commit 64d804c

@@ -1,6 +1,6 @@
 using System.Runtime.Serialization.Formatters.Binary;
 
-namespace MoMoney.Infrastructure.cloning
+namespace Gorilla.Commons.Infrastructure.Cloning
 {
     public class BinarySerializer<T> : Serializer<T>
     {

@@ -4,7 +4,7 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 using MbUnit.Framework;
 
-namespace MoMoney.Infrastructure.cloning
+namespace Gorilla.Commons.Infrastructure.Cloning
 {
     [Concern(typeof(BinarySerializer<TestItem>))]
     public abstract class behaves_like_serializer : concerns_for<ISerializer<TestItem>>

@@ -1,6 +1,6 @@
 using System;
 
-namespace MoMoney.Infrastructure.cloning
+namespace Gorilla.Commons.Infrastructure.Cloning
 {
     public interface ISerializer<T> : IDisposable
     {

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace MoMoney.Infrastructure.cloning
+namespace Gorilla.Commons.Infrastructure.Cloning
 {
     public interface IPrototype
     {

@@ -1,7 +1,7 @@
 using System.IO;
 using System.Runtime.Serialization;
 
-namespace MoMoney.Infrastructure.cloning
+namespace Gorilla.Commons.Infrastructure.Cloning
 {
     public class Serializer<T> : ISerializer<T>
     {

@@ -1,7 +1,7 @@
 using System;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace MoMoney.Infrastructure.Container
+namespace Gorilla.Commons.Infrastructure.Container
 {
     public class DependencyResolutionException<T> : Exception
     {

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace MoMoney.Infrastructure.Container
+namespace Gorilla.Commons.Infrastructure.Container
 {
     public interface IDependencyRegistry
     {

@@ -1,8 +1,8 @@
 using System;
 
-namespace MoMoney.Infrastructure.Container
+namespace Gorilla.Commons.Infrastructure.Container
 {
-    static public class resolve
+    static public class Resolve
     {
         static IDependencyRegistry underlying_registry;
         static bool initialized;

@@ -3,9 +3,9 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.Container
+namespace Gorilla.Commons.Infrastructure.Container
 {
-    [Concern(typeof (resolve))]
+    [Concern(typeof (Resolve))]
     public abstract class behaves_like_a_inversion_of_control_container : concerns
     {
     }
@@ -17,17 +17,17 @@ namespace MoMoney.Infrastructure.Container
                             registry = an<IDependencyRegistry>();
                             presenter = an<ICommand>();
                             registry.is_told_to(x => x.get_a<ICommand>()).it_will_return(presenter);
-                            resolve.initialize_with(registry);
+                            Resolve.initialize_with(registry);
                         };
 
-        because b = () => { result = resolve.dependency_for<ICommand>(); };
+        because b = () => { result = Resolve.dependency_for<ICommand>(); };
 
         it should_leverage_the_underlying_container_it_was_initialized_with =
             () => registry.was_told_to(x => x.get_a<ICommand>());
 
         it should_return_the_resolved_dependency = () => result.should_be_equal_to(presenter);
 
-        after_each_observation a = () => resolve.initialize_with(null);
+        after_each_observation a = () => Resolve.initialize_with(null);
 
         static IDependencyRegistry registry;
         static ICommand result;
@@ -40,12 +40,12 @@ namespace MoMoney.Infrastructure.Container
                         {
                             registry = an<IDependencyRegistry>();
                             registry.is_told_to(x => x.get_a<ICommand>()).it_will_throw(new Exception());
-                            resolve.initialize_with(registry);
+                            Resolve.initialize_with(registry);
                         };
 
-        because b = () => { the_call = call.to(() => resolve.dependency_for<ICommand>()); };
+        because b = () => { the_call = call.to(() => Resolve.dependency_for<ICommand>()); };
 
-        after_each_observation a = () => resolve.initialize_with(null);
+        after_each_observation a = () => Resolve.initialize_with(null);
 
         it should_throw_a_dependency_resolution_exception =
             () => the_call.should_have_thrown<DependencyResolutionException<ICommand>>();

@@ -1,20 +1,14 @@
 using System.Diagnostics;
 
-namespace MoMoney.Infrastructure.debugging
+namespace Gorilla.Commons.Infrastructure.Debugging
 {
-    public static class Launch
+    static public class Launch
     {
-        public static void the_debugger()
+        static public void the_debugger()
         {
 #if DEBUG
-            if (Debugger.IsAttached)
-            {
-                Debugger.Break();
-            }
-            else
-            {
-                Debugger.Launch();
-            }
+            if (Debugger.IsAttached) Debugger.Break();
+            else Debugger.Launch();
 #endif
         }
     }

@@ -4,7 +4,7 @@ using System.Linq.Expressions;
 using System.Threading;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace MoMoney.Infrastructure.eventing
+namespace Gorilla.Commons.Infrastructure.Eventing
 {
     public interface IEventAggregator
     {

@@ -4,7 +4,7 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 using Rhino.Mocks;
 
-namespace MoMoney.Infrastructure.eventing
+namespace Gorilla.Commons.Infrastructure.Eventing
 {
     public class behaves_like_event_aggregator : concerns_for<IEventAggregator, EventAggregator>
     {
@@ -18,7 +18,7 @@ namespace MoMoney.Infrastructure.eventing
     {
         it should_notify_all_subscribers_of_the_event = () =>
                                                             {
-                                                                first_subscriber.was_told_to(x => x.notify(message));
+                                                                first_subscriber.was_told_to<IEventSubscriber<TestEvent>>(x => x.notify(message));
                                                                 second_subscriber.was_told_to(x => x.notify(message));
                                                             };
 

@@ -1,4 +1,4 @@
-namespace MoMoney.Infrastructure.eventing
+namespace Gorilla.Commons.Infrastructure.Eventing
 {
     public interface IEvent
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Infrastructure.eventing
+namespace Gorilla.Commons.Infrastructure.Eventing
 {
     public interface IEventSubscriber<Event> where Event : IEvent
     {

@@ -3,13 +3,13 @@ using System.IO;
 using System.Threading;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace MoMoney.Infrastructure.Logging.ConsoleLogging
+namespace Gorilla.Commons.Infrastructure.Logging.Console
 {
     public class ConsoleLogger : ILogger
     {
         readonly TextWriter writer;
 
-        public ConsoleLogger() : this(Console.Out)
+        public ConsoleLogger() : this(System.Console.Out)
         {
         }
 
@@ -18,9 +18,9 @@ namespace MoMoney.Infrastructure.Logging.ConsoleLogging
             this.writer = writer;
         }
 
-        public void informational(string formattedString, params object[] arguments)
+        public void informational(string formatted_string, params object[] arguments)
         {
-            writer.WriteLine(formattedString, arguments);
+            writer.WriteLine(formatted_string, arguments);
         }
 
         public void debug(string formatted_string, params object[] arguments)

@@ -1,9 +1,9 @@
 using System;
 
-namespace MoMoney.Infrastructure.Logging
+namespace Gorilla.Commons.Infrastructure.Logging
 {
     public interface ILogFactory
     {
-        ILogger create_for(Type typeToCreateLoggerFor);
+        ILogger create_for(Type type_to_create_logger_for);
     }
 }
\ No newline at end of file

@@ -1,4 +1,4 @@
-namespace MoMoney.Infrastructure.Logging
+namespace Gorilla.Commons.Infrastructure.Logging
 {
     public interface ILoggable
     {

@@ -1,6 +1,6 @@
 using System;
 
-namespace MoMoney.Infrastructure.Logging
+namespace Gorilla.Commons.Infrastructure.Logging
 {
     public interface ILogger
     {

@@ -1,8 +1,8 @@
 using System;
-using MoMoney.Infrastructure.Container;
-using MoMoney.Infrastructure.Logging.ConsoleLogging;
+using Gorilla.Commons.Infrastructure.Container;
+using Gorilla.Commons.Infrastructure.Logging.Console;
 
-namespace MoMoney.Infrastructure.Logging
+namespace Gorilla.Commons.Infrastructure.Logging
 {
     public static class Log
     {
@@ -15,7 +15,7 @@ namespace MoMoney.Infrastructure.Logging
         {
             try
             {
-                return resolve.dependency_for<ILogFactory>().create_for(type_to_create_a_logger_for);
+                return Resolve.dependency_for<ILogFactory>().create_for(type_to_create_a_logger_for);
             }
             catch
             {

@@ -1,9 +1,8 @@
 using System;
-using MoMoney.Infrastructure.Logging;
 
-namespace MoMoney.Infrastructure.Extensions
+namespace Gorilla.Commons.Infrastructure.Logging
 {
-    public static class logging_extensions
+    public static class LoggingExtensions
     {
         public static ILogger log<T>(this T item_to_log)
         {

@@ -1,8 +1,8 @@
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Testing;
-using MoMoney.Infrastructure.Container;
 
-namespace MoMoney.Infrastructure.Logging
+namespace Gorilla.Commons.Infrastructure.Logging
 {
     [Concern(typeof (Log))]
     public class when_creating_a_logger_for_a_particular_type_ : concerns
@@ -18,12 +18,12 @@ namespace MoMoney.Infrastructure.Logging
                     registry.is_told_to(x => x.get_a<ILogFactory>()).it_will_return(factory);
                     factory.is_told_to(x => x.create_for(typeof (string))).it_will_return(logger);
 
-                    resolve.initialize_with(registry);
+                    Resolve.initialize_with(registry);
                 };
 
         because b = () => { result = Log.For("mo"); };
 
-        after_each_observation a = () => resolve.initialize_with(null);
+        after_each_observation a = () => Resolve.initialize_with(null);
 
         static ILogger result;
         static ILogger logger;

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace MoMoney.Infrastructure.reflection
+namespace Gorilla.Commons.Infrastructure.Reflection
 {
     public class ApplicationAssembly : IAssembly
     {

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MoMoney.Infrastructure.reflection
+namespace Gorilla.Commons.Infrastructure.Reflection
 {
     public interface IAssembly
     {

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.Container;
 
-namespace MoMoney.Infrastructure.registries
+namespace Gorilla.Commons.Infrastructure.Registries
 {
     public class DefaultRegistry<T> : IRegistry<T>
     {

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.Container;
 
-namespace MoMoney.Infrastructure.registries
+namespace Gorilla.Commons.Infrastructure.Registries
 {
     [Concern(typeof (DefaultRegistry<int>))]
     public class when_retrieving_all_the_items_from_the_default_repository :

@@ -4,7 +4,7 @@ using System.Linq.Expressions;
 using System.Threading;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     public class AsynchronousCommandProcessor : ICommandProcessor
     {

@@ -1,6 +1,6 @@
 using MoMoney.Utility.Core;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     public interface IBackgroundThread : IDisposableCommand
     {
@@ -23,7 +23,7 @@ namespace MoMoney.Infrastructure.Threading
 
         public void run()
         {
-            worker_thread.Begin();
+            worker_thread.begin();
         }
 
         public void Dispose()

@@ -1,9 +1,9 @@
 using System;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.Container;
 using MoMoney.Utility.Core;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     public interface IBackgroundThreadFactory
     {

@@ -1,18 +1,13 @@
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Testing;
-using MoMoney.Infrastructure.Container;
 using MoMoney.Utility.Core;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     [Concern(typeof (BackgroundThreadFactory))]
     public abstract class behaves_like_a_background_thread_factory : concerns_for<IBackgroundThreadFactory, BackgroundThreadFactory>
     {
-        //public override IBackgroundThreadFactory create_sut()
-        //{
-        //    return new BackgroundThreadFactory(registry);
-        //}
-
         context c = () => { registry = the_dependency<IDependencyRegistry>(); };
 
         protected static IDependencyRegistry registry;

@@ -3,7 +3,7 @@ using Gorilla.Commons.Testing;
 using MoMoney.Utility.Core;
 using Rhino.Mocks;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     [Concern(typeof (BackgroundThread))]
     public abstract class behaves_like_a_background_thread : concerns_for<IBackgroundThread, BackgroundThread>
@@ -22,7 +22,7 @@ namespace MoMoney.Infrastructure.Threading
     {
         it should_execute_the_command_asynchronously = () => command_to_execute.was_told_to(c => c.run());
 
-        it should_start_the_worker_thread_asynchronously = () => worker_thread.was_told_to(t => t.Begin());
+        it should_start_the_worker_thread_asynchronously = () => worker_thread.was_told_to(t => t.begin());
 
         because b = () =>
                         {

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq.Expressions;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     public class CommandProcessor : ICommandProcessor
     {

@@ -2,15 +2,11 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     [Concern(typeof (CommandProcessor))]
     public abstract class behaves_like_a_command_processor : concerns_for<ICommandProcessor, CommandProcessor>
     {
-        //public override ICommandProcessor create_sut()
-        //{
-        //    return new command_processor();
-        //}
     }
 
     public class when_running_all_the_queued_commands_waiting_for_execution : behaves_like_a_command_processor

@@ -2,7 +2,7 @@ using System;
 using System.Linq.Expressions;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     public interface ICommandProcessor : ICommand
     {

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Timers;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     public interface ITimer
     {

@@ -4,7 +4,7 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 using Rhino.Mocks;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     [Concern(typeof (IntervalTimer))]
     public abstract class behaves_like_an_interval_timer : concerns_for<ITimer, IntervalTimer>

@@ -1,6 +1,6 @@
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     public interface ISynchronizationContext : IParameterizedCommand<ICommand>
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     public interface ITimerClient
     {

@@ -0,0 +1,12 @@
+using System;
+using System.ComponentModel;
+
+namespace Gorilla.Commons.Infrastructure.Threading
+{
+    public interface IWorkerThread : IDisposable
+    {
+        event DoWorkEventHandler DoWork;
+        event EventHandler Disposed;
+        void begin();
+    }
+}
\ No newline at end of file

@@ -1,8 +1,8 @@
 using System.Threading;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.Container;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     public interface ISynchronizationContextFactory : IFactory<ISynchronizationContext>
     {

@@ -2,7 +2,7 @@ using System;
 using System.Threading;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     public interface ISynchronizedCommand : IParameterizedCommand<Action>, IParameterizedCommand<ICommand>
     {

@@ -1,7 +1,7 @@
 using System.Threading;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     public class SynchronizedContext : ISynchronizationContext
     {

@@ -1,7 +1,7 @@
 using System;
 using System.Timers;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     public interface ITimerFactory
     {

@@ -3,7 +3,7 @@ using System.Timers;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
     [Concern(typeof (TimerFactory))]
     public abstract class behaves_like_a_timer_factory : concerns_for<ITimerFactory, TimerFactory>

@@ -1,16 +1,9 @@
 using System;
 using System.ComponentModel;
-using MoMoney.Infrastructure.Extensions;
+using Gorilla.Commons.Infrastructure.Logging;
 
-namespace MoMoney.Infrastructure.Threading
+namespace Gorilla.Commons.Infrastructure.Threading
 {
-    public interface IWorkerThread : IDisposable
-    {
-        event DoWorkEventHandler DoWork;
-        event EventHandler Disposed;
-        void Begin();
-    }
-
     public class WorkerThread : Component, IWorkerThread
     {
         static readonly object do_work_key = new object();
@@ -28,7 +21,7 @@ namespace MoMoney.Infrastructure.Threading
             remove { Events.RemoveHandler(do_work_key, value); }
         }
 
-        public void Begin()
+        public void begin()
         {
             if (is_running)
             {

@@ -80,7 +80,7 @@
     <Compile Include="Logging\ILoggable.cs" />
     <Compile Include="Logging\ILogger.cs" />
     <Compile Include="Logging\Log.cs" />
-    <Compile Include="Logging\logging_extensions.cs" />
+    <Compile Include="Logging\LoggingExtensions.cs" />
     <Compile Include="Logging\LogSpecs.cs" />
     <Compile Include="Reflection\ApplicationAssembly.cs" />
     <Compile Include="Reflection\IAssembly.cs" />
@@ -98,6 +98,7 @@
     <Compile Include="Threading\IntervalTimerSpecs.cs" />
     <Compile Include="Threading\ISynchronizationContext.cs" />
     <Compile Include="Threading\ITimerClient.cs" />
+    <Compile Include="Threading\IWorkerThread.cs" />
     <Compile Include="Threading\SynchronizationContextFactory.cs" />
     <Compile Include="Threading\SynchronizedCommand.cs" />
     <Compile Include="Threading\SynchronizedContext.cs" />
@@ -119,7 +120,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
-    <Folder Include="Proxies\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Autofac;
+using Gorilla.Commons.Infrastructure.Container;
 
 namespace MoMoney.Infrastructure.Container.Autofac
 {

@@ -3,6 +3,7 @@ using Autofac;
 using Autofac.Builder;
 using Autofac.Modules;
 using AutofacContrib.DynamicProxy2;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Infrastructure.proxies;

@@ -1,7 +1,7 @@
 using Castle.Core;
 using Castle.MicroKernel.Registration;
+using Gorilla.Commons.Infrastructure.Logging;
 using MoMoney.Infrastructure.interceptors;
-using MoMoney.Infrastructure.Logging;
 
 namespace MoMoney.Infrastructure.Container.Windsor.configuration
 {

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using Castle.Core;
 using Castle.Windsor;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Infrastructure.proxies;

@@ -1,6 +1,7 @@
 using Castle.Core;
 using Castle.Windsor;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Testing;
 
 namespace MoMoney.Infrastructure.Container.Windsor

@@ -1,4 +1,5 @@
 using System;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.proxies;
 

@@ -1,4 +1,4 @@
-using MoMoney.Infrastructure.Threading;
+using Gorilla.Commons.Infrastructure.Threading;
 using MoMoney.Utility.Core;
 
 namespace MoMoney.Infrastructure.Extensions

@@ -1,8 +1,8 @@
 using System;
 using Castle.Core.Interceptor;
 using Castle.DynamicProxy;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Utility.Extensions;
-using MoMoney.Infrastructure.Container;
 
 namespace MoMoney.Infrastructure.interceptors
 {
@@ -15,7 +15,7 @@ namespace MoMoney.Infrastructure.interceptors
 
         static IInterceptor create_interceptor_for<T>() where T : class
         {
-            Func<T> get_the_implementation = resolve.dependency_for<T>;
+            Func<T> get_the_implementation = Resolve.dependency_for<T>;
             return new LazyLoadedInterceptor<T>(get_the_implementation.memorize());
         }
 

@@ -1,6 +1,6 @@
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Testing;
-using MoMoney.Infrastructure.Container;
 
 namespace MoMoney.Infrastructure.interceptors
 {
@@ -10,10 +10,10 @@ namespace MoMoney.Infrastructure.interceptors
         context c = () =>
                         {
                             test_container = dependency<IDependencyRegistry>();
-                            resolve.initialize_with(test_container);
+                            Resolve.initialize_with(test_container);
                         };
 
-        after_each_observation a = () => resolve.initialize_with(null);
+        after_each_observation a = () => Resolve.initialize_with(null);
 
         protected static IDependencyRegistry test_container;
     }

@@ -1,6 +1,6 @@
 using System.Diagnostics;
 using Castle.Core.Interceptor;
-using MoMoney.Infrastructure.Extensions;
+using Gorilla.Commons.Infrastructure.Logging;
 
 namespace MoMoney.Infrastructure.interceptors
 {

@@ -1,5 +1,5 @@
 using Castle.Core.Interceptor;
-using MoMoney.Infrastructure.eventing;
+using Gorilla.Commons.Infrastructure.Eventing;
 
 namespace MoMoney.Infrastructure.interceptors
 {

@@ -1,10 +1,11 @@
 using System;
 using System.IO;
+using Gorilla.Commons.Infrastructure.Logging;
 using log4net;
 using log4net.Config;
 using MoMoney.Infrastructure.Extensions;
 
-namespace MoMoney.Infrastructure.Logging.Log4NetLogging
+namespace MoMoney.Infrastructure.Logging.Log4Net
 {
     public class Log4NetLogFactory : ILogFactory
     {
@@ -13,9 +14,9 @@ namespace MoMoney.Infrastructure.Logging.Log4NetLogging
             XmlConfigurator.Configure(PathToConfigFile());
         }
 
-        public ILogger create_for(Type typeToCreateLoggerFor)
+        public ILogger create_for(Type type_to_create_logger_for)
         {
-            return new Log4NetLogger(LogManager.GetLogger(typeToCreateLoggerFor));
+            return new Log4NetLogger(LogManager.GetLogger(type_to_create_logger_for));
         }
 
         private FileInfo PathToConfigFile()

@@ -1,7 +1,8 @@
 using System;
+using Gorilla.Commons.Infrastructure.Logging;
 using log4net;
 
-namespace MoMoney.Infrastructure.Logging.Log4NetLogging
+namespace MoMoney.Infrastructure.Logging.Log4Net
 {
     public class Log4NetLogger : ILogger
     {

@@ -1,5 +1,5 @@
 using Castle.Core.Interceptor;
-using MoMoney.Infrastructure.Threading;
+using Gorilla.Commons.Infrastructure.Threading;
 using MoMoney.Utility.Core;
 
 namespace MoMoney.Infrastructure.proxies.Interceptors

@@ -1,7 +1,7 @@
 using Castle.Core.Interceptor;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Infrastructure.Threading;
 using Gorilla.Commons.Testing;
-using MoMoney.Infrastructure.Threading;
 using MoMoney.Utility.Core;
 
 namespace MoMoney.Infrastructure.proxies.Interceptors

@@ -1,4 +1,5 @@
 using Castle.Core.Interceptor;
+using Gorilla.Commons.Infrastructure.Threading;
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.interceptors;
 

@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-using MoMoney.Domain.Core;
-
-namespace MoMoney.DataAccess.core
-{
-    //public interface IDatabaseGateway
-    //{
-    //    IEnumerable<T> all<T>() where T : IEntity;
-    //    void save<T>(T item) where T : IEntity;
-    //}
-}
\ No newline at end of file

@@ -1,24 +0,0 @@
-using MoMoney.Domain.Core;
-
-namespace MoMoney.Infrastructure.transactions
-{
-    //internal class NullUnitOfWork<T> : IUnitOfWork<T> where T : IEntity
-    //{
-    //    public void register(T entity)
-    //    {
-    //    }
-
-    //    public void commit()
-    //    {
-    //    }
-
-    //    public bool is_dirty()
-    //    {
-    //        return false;
-    //    }
-
-    //    public void Dispose()
-    //    {
-    //    }
-    //}
-}
\ No newline at end of file

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Gorilla.Commons.Utility.Extensions;
-using MoMoney.DataAccess.core;
-using MoMoney.Domain.Core;
-
-namespace MoMoney.Infrastructure.transactions
-{
-    //public interface IUnitOfWork : IDisposable
-    //{
-    //    void commit();
-    //    bool is_dirty();
-    //}
-
-    //public interface IUnitOfWork<T> : IUnitOfWork where T : IEntity
-    //{
-    //    void register(T entity);
-    //}
-
-    //public class unit_of_work<T> : IUnitOfWork<T> where T : IEntity
-    //{
-    //    readonly IDatabaseGateway gateway;
-    //    readonly IUnitOfWorkRegistrationFactory<T> factory;
-    //    readonly IList<IUnitOfWorkRegistration<T>> registered_items;
-
-    //    public unit_of_work(IDatabaseGateway repository, IUnitOfWorkRegistrationFactory<T> factory)
-    //    {
-    //        gateway = repository;
-    //        this.factory = factory;
-    //        registered_items = new List<IUnitOfWorkRegistration<T>>();
-    //    }
-
-    //    public void register(T entity)
-    //    {
-    //        registered_items.Add(factory.map_from(entity));
-    //    }
-
-    //    public void commit()
-    //    {
-    //        registered_items.each(x => { if (x.contains_changes()) gateway.save(x.current); });
-    //    }
-
-    //    public bool is_dirty()
-    //    {
-    //        return registered_items.Count(x => x.contains_changes()) > 0;
-    //    }
-
-    //    public void Dispose()
-    //    {
-    //        registered_items.Clear();
-    //    }
-    //}
-}
\ No newline at end of file

@@ -1,108 +0,0 @@
-using developwithpassion.bdd.contexts;
-using Gorilla.Commons.Testing;
-using MoMoney.DataAccess.core;
-using MoMoney.Domain.Core;
-
-namespace MoMoney.Infrastructure.transactions
-{
-    //[Concern(typeof (unit_of_work<IEntity>))]
-    //public abstract class behaves_like_a_unit_of_work : concerns_for<IUnitOfWork<IEntity>, unit_of_work<IEntity>>
-    //{
-    //    public override IUnitOfWork<IEntity> create_sut()
-    //    {
-    //        return new unit_of_work<IEntity>(repository, factory);
-    //    }
-
-    //    context c = () =>
-    //                    {
-    //                        repository = the_dependency<IDatabaseGateway>();
-    //                        factory = the_dependency<IUnitOfWorkRegistrationFactory<IEntity>>();
-    //                    };
-
-    //    protected static IDatabaseGateway repository;
-    //    protected static IUnitOfWorkRegistrationFactory<IEntity> factory;
-    //}
-
-    //public class when_committing_a_unit_of_work : behaves_like_a_unit_of_work
-    //{
-    //    it should_save_each_registered_item = () =>
-    //                                              {
-    //                                                  repository.was_told_to(x => x.save(first_item));
-    //                                                  repository.was_told_to(x => x.save(second_item));
-    //                                              };
-
-    //    context c = () =>
-    //                    {
-    //                        first_item = an<IEntity>();
-    //                        second_item = an<IEntity>();
-
-    //                        var first_registration = an<IUnitOfWorkRegistration<IEntity>>();
-    //                        var second_registration = an<IUnitOfWorkRegistration<IEntity>>();
-
-    //                        when_the(factory).is_told_to(x => x.map_from(first_item)).it_will_return(first_registration);
-    //                        when_the(factory).is_told_to(x => x.map_from(second_item)).it_will_return(
-    //                            second_registration);
-    //                        when_the(first_registration).is_told_to(x => x.contains_changes()).it_will_return(true);
-    //                        when_the(second_registration).is_told_to(x => x.contains_changes()).it_will_return(true);
-    //                        when_the(first_registration).is_told_to(x => x.current).it_will_return(first_item);
-    //                        when_the(second_registration).is_told_to(x => x.current).it_will_return(second_item);
-    //                    };
-
-    //    because b = () =>
-    //                    {
-    //                        sut.register(first_item);
-    //                        sut.register(second_item);
-    //                        sut.commit();
-    //                    };
-
-    //    static IEntity first_item;
-    //    static IEntity second_item;
-    //}
-
-    //public class when_checking_if_there_are_changes_and_there_are : behaves_like_a_unit_of_work
-    //{
-    //    it should_tell_the_truth = () => result.should_be_true();
-
-    //    context c = () =>
-    //                    {
-    //                        first_item = an<IEntity>();
-    //                        var first_registration = an<IUnitOfWorkRegistration<IEntity>>();
-
-    //                        when_the(factory).is_told_to(x => x.map_from(first_item)).it_will_return(first_registration);
-    //                        when_the(first_registration).is_told_to(x => x.contains_changes()).it_will_return(true);
-    //                        when_the(first_registration).is_told_to(x => x.current).it_will_return(first_item);
-    //                    };
-
-    //    because b = () =>
-    //                    {
-    //                        sut.register(first_item);
-    //                        result = sut.is_dirty();
-    //                    };
-
-    //    static bool result;
-    //    static IEntity first_item;
-    //}
-
-    //public class when_checking_if_there_are_changes_and_there_are_not : behaves_like_a_unit_of_work
-    //{
-    //    it should_tell_the_truth = () => result.should_be_false();
-
-    //    context c = () =>
-    //                    {
-    //                        first_item = an<IEntity>();
-    //                        var first_registration = an<IUnitOfWorkRegistration<IEntity>>();
-
-    //                        when_the(factory).is_told_to(x => x.map_from(first_item)).it_will_return(first_registration);
-    //                        when_the(first_registration).is_told_to(x => x.contains_changes()).it_will_return(false);
-    //                    };
-
-    //    because b = () =>
-    //                    {
-    //                        sut.register(first_item);
-    //                        result = sut.is_dirty();
-    //                    };
-
-    //    static bool result;
-    //    static IEntity first_item;
-    //}
-}
\ No newline at end of file

@@ -1,18 +0,0 @@
-using MoMoney.Domain.Core;
-using MoMoney.Infrastructure.Container;
-
-namespace MoMoney.Infrastructure.transactions
-{
-    //public static class UnitOfWork
-    //{
-    //    public static IUnitOfWork<T> For<T>() where T : IEntity
-    //    {
-    //        IUnitOfWork<T> unit_of_work = null;
-    //        if (resolve.is_initialized())
-    //        {
-    //            unit_of_work = resolve.dependency_for<IUnitOfWorkRegistry>().start_unit_of_work_for<T>();
-    //        }
-    //        return unit_of_work ?? new NullUnitOfWork<T>();
-    //    }
-    //}
-}
\ No newline at end of file

@@ -1,28 +0,0 @@
-using MoMoney.DataAccess.core;
-using MoMoney.Domain.Core;
-using MoMoney.Infrastructure.Container;
-
-namespace MoMoney.Infrastructure.transactions
-{
-    //public interface IUnitOfWorkFactory
-    //{
-    //    IUnitOfWork<T> create_for<T>() where T : IEntity;
-    //}
-
-    //public class UnitOfWorkFactory : IUnitOfWorkFactory
-    //{
-    //    readonly IDatabaseGateway repository;
-    //    readonly IDependencyRegistry registry;
-
-    //    public UnitOfWorkFactory(IDatabaseGateway repository, IDependencyRegistry registry)
-    //    {
-    //        this.repository = repository;
-    //        this.registry = registry;
-    //    }
-
-    //    public IUnitOfWork<T> create_for<T>() where T : IEntity
-    //    {
-    //        return new unit_of_work<T>(repository, registry.get_a<IUnitOfWorkRegistrationFactory<T>>());
-    //    }
-    //}
-}
\ No newline at end of file

@@ -1,43 +0,0 @@
-using System.Reflection;
-
-namespace MoMoney.Infrastructure.transactions
-{
-    //public interface IUnitOfWorkRegistration<T>
-    //{
-    //    T current { get; }
-    //    bool contains_changes();
-    //}
-
-    //public class UnitOfWorkRegistration<T> : IUnitOfWorkRegistration<T>
-    //{
-    //    readonly T original;
-
-    //    public UnitOfWorkRegistration(T original, T current)
-    //    {
-    //        this.original = original;
-    //        this.current = current;
-    //    }
-
-    //    public T current { get; set; }
-
-    //    public bool contains_changes()
-    //    {
-    //        var type = original.GetType();
-    //        var fields = type.GetFields(BindingFlags.NonPublic | BindingFlags.Instance);
-    //        foreach (var field in fields)
-    //        {
-    //            var original_value = field.GetValue(original);
-    //            var current_value = field.GetValue(current);
-    //            if (original_value == null && current_value != null)
-    //            {
-    //                return true;
-    //            }
-    //            if (original_value != null && !original_value.Equals(current_value))
-    //            {
-    //                return true;
-    //            }
-    //        }
-    //        return false;
-    //    }
-    //}
-}
\ No newline at end of file

@@ -1,29 +0,0 @@
-using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.cloning;
-
-namespace MoMoney.Infrastructure.transactions
-{
-    //public interface IUnitOfWorkRegistrationFactory<T> : IMapper<T, IUnitOfWorkRegistration<T>>
-    //{
-    //}
-
-    //public class UnitOfWorkRegistrationFactory<T> : IUnitOfWorkRegistrationFactory<T>
-    //{
-    //    readonly IPrototype prototype;
-
-    //    public UnitOfWorkRegistrationFactory(IPrototype prototype)
-    //    {
-    //        this.prototype = prototype;
-    //    }
-
-    //    public IUnitOfWorkRegistration<T> map_from(T item)
-    //    {
-    //        return new UnitOfWorkRegistration<T>(create_prototype(item), item);
-    //    }
-
-    //    T create_prototype(T item)
-    //    {
-    //        return prototype.clone(item);
-    //    }
-    //}
-}
\ No newline at end of file

@@ -1,80 +0,0 @@
-using developwithpassion.bdd.contexts;
-using Gorilla.Commons.Testing;
-using MoMoney.Domain.Core;
-
-namespace MoMoney.Infrastructure.transactions
-{
-    //public abstract class behaves_like_unit_of_work_registration : concerns_for<IUnitOfWorkRegistration<Pillow>>
-    //{
-    //}
-
-    //public class when_comparing_the_current_instance_of_a_component_with_its_original_and_it_has_changes :
-    //    behaves_like_unit_of_work_registration
-    //{
-    //    it should_indicate_that_there_are_changes = () => result.should_be_true();
-
-    //    because b = () => { result = sut.contains_changes(); };
-
-    //    public override IUnitOfWorkRegistration<Pillow> create_sut()
-    //    {
-    //        return new UnitOfWorkRegistration<Pillow>(new Pillow("pink"), new Pillow("yellow"));
-    //    }
-
-    //    static bool result;
-    //}
-
-    //public class when_the_original_instance_has_a_null_field_that_is_now_not_null :
-    //    behaves_like_unit_of_work_registration
-    //{
-    //    it should_indicate_that_there_are_changes = () => result.should_be_true();
-
-    //    because b = () => { result = sut.contains_changes(); };
-
-    //    public override IUnitOfWorkRegistration<Pillow> create_sut()
-    //    {
-    //        return new UnitOfWorkRegistration<Pillow>(new Pillow(null), new Pillow("yellow"));
-    //    }
-
-    //    static bool result;
-    //}
-
-    //public class when_the_original_instance_had_a_non_null_field_and_the_current_instance_has_a_null_field :
-    //    behaves_like_unit_of_work_registration
-    //{
-    //    it should_indicate_that_there_are_changes = () => result.should_be_true();
-
-    //    because b = () => { result = sut.contains_changes(); };
-
-    //    public override IUnitOfWorkRegistration<Pillow> create_sut()
-    //    {
-    //        return new UnitOfWorkRegistration<Pillow>(new Pillow("green"), new Pillow(null));
-    //    }
-
-    //    static bool result;
-    //}
-
-    //public class when_the_original_instance_has_the_same_value_as_the_current_instance :
-    //    behaves_like_unit_of_work_registration
-    //{
-    //    it should_indicate_that_there_are_no_changes = () => result.should_be_false();
-
-    //    because b = () => { result = sut.contains_changes(); };
-
-    //    public override IUnitOfWorkRegistration<Pillow> create_sut()
-    //    {
-    //        return new UnitOfWorkRegistration<Pillow>(new Pillow("green"), new Pillow("green"));
-    //    }
-
-    //    static bool result;
-    //}
-
-    //public class Pillow : Entity<Pillow>
-    //{
-    //    readonly string color;
-
-    //    public Pillow(string color)
-    //    {
-    //        this.color = color;
-    //    }
-    //}
-}
\ No newline at end of file

@@ -1,68 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Gorilla.Commons.Utility.Extensions;
-using MoMoney.Domain.Core;
-
-namespace MoMoney.Infrastructure.transactions
-{
-    //public interface IUnitOfWorkRegistry : IDisposable
-    //{
-    //    void commit_all();
-    //    IUnitOfWork<T> start_unit_of_work_for<T>() where T : IEntity;
-    //    bool has_changes_to_commit();
-    //}
-
-    //public class UnitOfWorkRegistry : IUnitOfWorkRegistry
-    //{
-    //    readonly IUnitOfWorkFactory factory;
-    //    readonly IDictionary<Type, IUnitOfWork> units_of_work;
-
-    //    public UnitOfWorkRegistry(IUnitOfWorkFactory factory)
-    //    {
-    //        this.factory = factory;
-    //        units_of_work = new Dictionary<Type, IUnitOfWork>();
-    //    }
-
-    //    public IUnitOfWork<T> start_unit_of_work_for<T>() where T : IEntity
-    //    {
-    //        if (units_of_work.ContainsKey(typeof (T)))
-    //        {
-    //            return units_of_work[typeof (T)].downcast_to<IUnitOfWork<T>>();
-    //        }
-
-    //        var new_unit_of_work = factory.create_for<T>();
-    //        units_of_work.Add(typeof (T), new_unit_of_work);
-    //        return new_unit_of_work;
-    //    }
-
-    //    public bool has_changes_to_commit()
-    //    {
-    //        return units_of_work.Values.Count(x => x.is_dirty()) > 0;
-    //    }
-
-    //    public void commit_all()
-    //    {
-    //        if (contains_items_to_commit())
-    //        {
-    //            units_of_work.Values.each(x => x.commit());
-    //        }
-    //    }
-
-    //    void clear_all()
-    //    {
-    //        units_of_work.Values.each(x => x.Dispose());
-    //        units_of_work.Clear();
-    //    }
-
-    //    bool contains_items_to_commit()
-    //    {
-    //        return units_of_work.Count > 0;
-    //    }
-
-    //    public void Dispose()
-    //    {
-    //        clear_all();
-    //    }
-    //}
-}
\ No newline at end of file

@@ -1,73 +0,0 @@
-using developwithpassion.bdd.contexts;
-using Gorilla.Commons.Testing;
-using MoMoney.Domain.Core;
-
-namespace MoMoney.Infrastructure.transactions
-{
-    //[Concern(typeof (UnitOfWorkRegistry))]
-    //public abstract class behaves_like_unit_of_work_registery : concerns_for<IUnitOfWorkRegistry, UnitOfWorkRegistry>
-    //{
-    //    context c = () => { factory = the_dependency<IUnitOfWorkFactory>(); };
-
-    //    static protected IUnitOfWorkFactory factory;
-    //}
-
-    //public class when_starting_a_unit_of_work_for_a_new_type : behaves_like_unit_of_work_registery
-    //{
-    //    it should_register_a_new_unit_of_work = () => factory.was_told_to(x => x.create_for<IEntity>());
-
-    //    it should_return_the_new_unit_of_work = () => result.should_be_equal_to(unit_of_work);
-
-    //    context c = () =>
-    //                    {
-    //                        unit_of_work = an<IUnitOfWork<IEntity>>();
-    //                        factory.is_told_to(x => x.create_for<IEntity>()).it_will_return(unit_of_work);
-    //                    };
-
-    //    because b = () => { result = sut.start_unit_of_work_for<IEntity>(); };
-
-    //    static IUnitOfWork<IEntity> unit_of_work;
-    //    static IUnitOfWork<IEntity> result;
-    //}
-
-    //public class when_attempting_to_start_a_unit_of_work_for_a_type_that_already_has_one_started :
-    //    behaves_like_unit_of_work_registery
-    //{
-    //    it should_return_the_already_started_unit_of_work = () => result.should_be_equal_to(unit_of_work);
-
-    //    context c = () =>
-    //                    {
-    //                        unit_of_work = an<IUnitOfWork<IEntity>>();
-
-    //                        factory.is_told_to(x => x.create_for<IEntity>()).it_will_return(unit_of_work).Repeat.Once();
-    //                    };
-
-    //    because b = () =>
-    //                    {
-    //                        sut.start_unit_of_work_for<IEntity>();
-    //                        result = sut.start_unit_of_work_for<IEntity>();
-    //                    };
-
-    //    static IUnitOfWork<IEntity> unit_of_work;
-    //    static IUnitOfWork<IEntity> result;
-    //}
-
-    //public class when_committing_all_the_active_units_of_work : behaves_like_unit_of_work_registery
-    //{
-    //    it should_commit_each_one = () => unit_of_work.was_told_to(x => x.commit());
-
-    //    context c = () =>
-    //                    {
-    //                        unit_of_work = an<IUnitOfWork<IEntity>>();
-    //                        factory.is_told_to(x => x.create_for<IEntity>()).it_will_return(unit_of_work).Repeat.Once();
-    //                    };
-
-    //    because b = () =>
-    //                    {
-    //                        sut.start_unit_of_work_for<IEntity>();
-    //                        sut.commit_all();
-    //                    };
-
-    //    static IUnitOfWork<IEntity> unit_of_work;
-    //}
-}
\ No newline at end of file

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
+using Gorilla.Commons.Infrastructure.Logging;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Domain.Core;
-using MoMoney.Infrastructure.Extensions;
 
 namespace MoMoney.Infrastructure.transactions2
 {

@@ -1,5 +1,5 @@
+using Gorilla.Commons.Infrastructure.Container;
 using MoMoney.Domain.Core;
-using MoMoney.Infrastructure.Container;
 
 namespace MoMoney.Infrastructure.transactions2
 {

@@ -1,5 +1,5 @@
+using Gorilla.Commons.Infrastructure.Logging;
 using MoMoney.Domain.Core;
-using MoMoney.Infrastructure.Extensions;
 
 namespace MoMoney.Infrastructure.transactions2
 {

@@ -1,5 +1,5 @@
 using System.Reflection;
-using MoMoney.Infrastructure.Extensions;
+using Gorilla.Commons.Infrastructure.Logging;
 
 namespace MoMoney.Infrastructure.transactions2
 {

@@ -1,5 +1,5 @@
+using Gorilla.Commons.Infrastructure.Cloning;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.cloning;
 
 namespace MoMoney.Infrastructure.transactions2
 {

@@ -1,7 +1,7 @@
 using Castle.Core.Interceptor;
+using Gorilla.Commons.Infrastructure.Eventing;
+using Gorilla.Commons.Infrastructure.Logging;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.eventing;
-using MoMoney.Infrastructure.Extensions;
 
 namespace MoMoney.Infrastructure.transactions2
 {

@@ -110,8 +110,8 @@
     <Compile Include="Interceptors\LoggingInterceptor.cs" />
     <Compile Include="Interceptors\RaiseEventInterceptor.cs" />
     <Compile Include="Interceptors\SynchronizedInterceptor.cs" />
-    <Compile Include="Logging\Log4NetLogging\Log4NetLogFactory.cs" />
-    <Compile Include="Logging\Log4NetLogging\Log4NetLogger.cs" />
+    <Compile Include="Logging\Log4Net\Log4NetLogFactory.cs" />
+    <Compile Include="Logging\Log4Net\Log4NetLogger.cs" />
     <Compile Include="Proxies\IConstraintSelector.cs" />
     <Compile Include="Proxies\IInterceptorConstraint.cs" />
     <Compile Include="Proxies\IInterceptorConstraintFactory.cs" />
@@ -184,14 +184,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Cloning\" />
-    <Folder Include="Debugging\" />
-    <Folder Include="Eventing\" />
-    <Folder Include="Logging\ConsoleLogging\" />
     <Folder Include="Properties\" />
-    <Folder Include="Reflection\" />
-    <Folder Include="Registries\" />
-    <Folder Include="Transactions\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

@@ -1,5 +1,5 @@
 using System.Windows.Forms;
-using MoMoney.Infrastructure.Threading;
+using Gorilla.Commons.Infrastructure.Threading;
 
 namespace MoMoney.Infrastructure.System
 {

@@ -1,5 +1,5 @@
+using Gorilla.Commons.Infrastructure.Logging;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.Logging;
 using MoMoney.Presentation.Model.Projects;
 
 namespace MoMoney.Presentation.Model.Menu.File.Commands

@@ -1,5 +1,5 @@
+using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.eventing;
 using MoMoney.Infrastructure.System;
 using MoMoney.Presentation.Model.messages;
 

@@ -1,6 +1,6 @@
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Testing;
-using MoMoney.Infrastructure.eventing;
 using MoMoney.Infrastructure.System;
 using MoMoney.Presentation.Model.messages;
 

@@ -1,4 +1,4 @@
-using MoMoney.Infrastructure.Container;
+using Gorilla.Commons.Infrastructure.Container;
 
 namespace MoMoney.Presentation.Model.Menu
 {
@@ -6,7 +6,7 @@ namespace MoMoney.Presentation.Model.Menu
     {
         public static IMenuItemBuilder a_menu_item()
         {
-            return resolve.dependency_for<IMenuItemBuilder>();
+            return Resolve.dependency_for<IMenuItemBuilder>();
         }
 
         public static IMenuItem a_menu_item_separator()
@@ -16,7 +16,7 @@ namespace MoMoney.Presentation.Model.Menu
 
         public static IToolbarItemBuilder a_tool_bar_item()
         {
-            return resolve.dependency_for<IToolbarItemBuilder>();
+            return Resolve.dependency_for<IToolbarItemBuilder>();
         }
     }
 }
\ No newline at end of file

@@ -1,8 +1,8 @@
 using System;
+using Gorilla.Commons.Infrastructure.Container;
+using Gorilla.Commons.Infrastructure.Eventing;
+using Gorilla.Commons.Infrastructure.Threading;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.Container;
-using MoMoney.Infrastructure.eventing;
-using MoMoney.Infrastructure.Threading;
 using MoMoney.Presentation.Model.keyboard;
 using MoMoney.Presentation.Resources;
 

@@ -1,9 +1,9 @@
 using System;
 using System.Windows.Forms;
+using Gorilla.Commons.Infrastructure.Container;
+using Gorilla.Commons.Infrastructure.Eventing;
+using Gorilla.Commons.Infrastructure.Threading;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.Container;
-using MoMoney.Infrastructure.eventing;
-using MoMoney.Infrastructure.Threading;
 using MoMoney.Presentation.Resources;
 
 namespace MoMoney.Presentation.Model.Menu

@@ -1,4 +1,4 @@
-using MoMoney.Infrastructure.eventing;
+using Gorilla.Commons.Infrastructure.Eventing;
 
 namespace MoMoney.Presentation.Model.messages
 {

@@ -1,4 +1,4 @@
-using MoMoney.Infrastructure.eventing;
+using Gorilla.Commons.Infrastructure.Eventing;
 
 namespace MoMoney.Presentation.Model.messages
 {

@@ -1,4 +1,4 @@
-using MoMoney.Infrastructure.eventing;
+using Gorilla.Commons.Infrastructure.Eventing;
 
 namespace MoMoney.Presentation.Model.messages
 {

@@ -1,4 +1,4 @@
-using MoMoney.Infrastructure.eventing;
+using Gorilla.Commons.Infrastructure.Eventing;
 
 namespace MoMoney.Presentation.Model.messages
 {

@@ -1,5 +1,5 @@
 using System;
-using MoMoney.Infrastructure.eventing;
+using Gorilla.Commons.Infrastructure.Eventing;
 
 namespace MoMoney.Presentation.Model.messages
 {

@@ -1,4 +1,4 @@
-using MoMoney.Infrastructure.eventing;
+using Gorilla.Commons.Infrastructure.Eventing;
 
 namespace MoMoney.Presentation.Model.messages
 {

@@ -1,7 +1,7 @@
+using Gorilla.Commons.Infrastructure.Eventing;
+using Gorilla.Commons.Infrastructure.Logging;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
-using MoMoney.Infrastructure.eventing;
-using MoMoney.Infrastructure.Extensions;
 using MoMoney.Infrastructure.transactions2;
 using MoMoney.Presentation.Model.messages;
 

@@ -1,8 +1,8 @@
 using System;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Extensions;
-using MoMoney.Infrastructure.eventing;
 using MoMoney.Infrastructure.transactions2;
 using MoMoney.Presentation.Model.messages;
 

@@ -1,5 +1,5 @@
+using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.eventing;
 using MoMoney.Infrastructure.System;
 using MoMoney.Presentation.Model.messages;
 

@@ -1,4 +1,4 @@
-using MoMoney.Infrastructure.Threading;
+using Gorilla.Commons.Infrastructure.Threading;
 using MoMoney.Presentation.Core;
 
 namespace MoMoney.Presentation.Presenters.Commands

@@ -1,4 +1,4 @@
-using MoMoney.Infrastructure.eventing;
+using Gorilla.Commons.Infrastructure.Eventing;
 using MoMoney.Presentation.Core;
 using MoMoney.Presentation.Model.Menu.File.Commands;
 using MoMoney.Presentation.Model.messages;

@@ -1,6 +1,6 @@
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Testing;
-using MoMoney.Infrastructure.eventing;
 using MoMoney.Presentation.Views.Shell;
 
 namespace MoMoney.Presentation.Presenters.Shell

@@ -1,5 +1,5 @@
 using System.Net.NetworkInformation;
-using MoMoney.Infrastructure.eventing;
+using Gorilla.Commons.Infrastructure.Eventing;
 using MoMoney.Modules.Core;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Presentation.Resources;

@@ -1,6 +1,6 @@
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Testing;
-using MoMoney.Infrastructure.eventing;
 using MoMoney.Presentation.Resources;
 using MoMoney.Presentation.Views.Shell;
 

@@ -1,6 +1,6 @@
+using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Domain.Core;
-using MoMoney.Infrastructure.eventing;
 using MoMoney.Modules.Core;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Presentation.Resources;

@@ -1,6 +1,6 @@
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Testing;
-using MoMoney.Infrastructure.eventing;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Presentation.Resources;
 using MoMoney.Presentation.Views.Shell;

@@ -1,4 +1,4 @@
-using MoMoney.Infrastructure.eventing;
+using Gorilla.Commons.Infrastructure.Eventing;
 using MoMoney.Modules.Core;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Presentation.Views.Shell;

@@ -1,5 +1,5 @@
-using MoMoney.Infrastructure.eventing;
-using MoMoney.Infrastructure.Extensions;
+using Gorilla.Commons.Infrastructure.Eventing;
+using Gorilla.Commons.Infrastructure.Logging;
 using MoMoney.Modules.Core;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Presentation.Model.Projects;

@@ -1,6 +1,6 @@
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Testing;
-using MoMoney.Infrastructure.eventing;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Presentation.Model.Projects;
 using MoMoney.Presentation.Views.Shell;

@@ -1,4 +1,4 @@
-using MoMoney.Infrastructure.eventing;
+using Gorilla.Commons.Infrastructure.Eventing;
 using MoMoney.Modules.Core;
 using MoMoney.Presentation.Core;
 using MoMoney.Presentation.Model.messages;

@@ -1,7 +1,7 @@
 using System;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Testing;
-using MoMoney.Infrastructure.eventing;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Presentation.Views.Shell;
 

@@ -1,5 +1,5 @@
 using System;
-using MoMoney.Infrastructure.Threading;
+using Gorilla.Commons.Infrastructure.Threading;
 using MoMoney.Presentation.Views.Startup;
 
 namespace MoMoney.Presentation.Presenters.Startup

@@ -1,5 +1,5 @@
 using System;
-using MoMoney.Infrastructure.Threading;
+using Gorilla.Commons.Infrastructure.Threading;
 using MoMoney.Presentation.Views.Startup;
 
 namespace MoMoney.Presentation.Presenters.Startup

@@ -1,4 +1,4 @@
-using MoMoney.Infrastructure.Threading;
+using Gorilla.Commons.Infrastructure.Threading;
 using MoMoney.Presentation.Views.Startup;
 using MoMoney.Utility.Core;
 

@@ -1,7 +1,7 @@
 using System;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Infrastructure.Threading;
 using Gorilla.Commons.Testing;
-using MoMoney.Infrastructure.Threading;
 using MoMoney.Presentation.Views.Startup;
 
 namespace MoMoney.Presentation.Presenters.Startup

@@ -1,8 +1,8 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.Container;
 
 namespace MoMoney.Presentation.Views.Shell
 {
@@ -24,7 +24,7 @@ namespace MoMoney.Presentation.Views.Shell
 
         public static Button will_execute<Command>(this Button button, Func<bool> when) where Command : ICommand
         {
-            button.Click += (sender, e) => { if (when()) resolve.dependency_for<Command>().run(); };
+            button.Click += (sender, e) => { if (when()) Resolve.dependency_for<Command>().run(); };
             button.Enabled = when();
             return button;
         }

@@ -1,6 +1,6 @@
+using Gorilla.Commons.Infrastructure.Container;
+using Gorilla.Commons.Infrastructure.Threading;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.Container;
-using MoMoney.Infrastructure.Threading;
 
 namespace MoMoney.Tasks.infrastructure.core
 {

@@ -1,10 +1,10 @@
 using System;
 using System.Reflection;
+using Gorilla.Commons.Infrastructure.Reflection;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Infrastructure.Container;
 using MoMoney.Infrastructure.Container.Windsor.configuration;
-using MoMoney.Infrastructure.reflection;
 
 namespace MoMoney.boot.container.registration
 {

@@ -1,10 +1,10 @@
 using System;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Infrastructure.Reflection;
 using Gorilla.Commons.Testing;
 using MbUnit.Framework;
 using MoMoney.Infrastructure.Container;
 using MoMoney.Infrastructure.Container.Windsor.configuration;
-using MoMoney.Infrastructure.reflection;
 
 namespace MoMoney.boot.container.registration
 {

@@ -1,3 +1,4 @@
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Infrastructure.Container;
@@ -18,8 +19,8 @@ namespace MoMoney.boot.container.registration
         {
             //register.singleton<ISessionContext, SessionContext>();
             register.singleton<IDatabase, Database>();
-            register.singleton(() => resolve.dependency_for<IDatabase>().downcast_to<IDatabaseConfiguration>());
-            register.singleton<ISession>(() => resolve.dependency_for<ISessionProvider>().get_the_current_session());
+            register.singleton(() => Resolve.dependency_for<IDatabase>().downcast_to<IDatabaseConfiguration>());
+            register.singleton<ISession>(() => Resolve.dependency_for<ISessionProvider>().get_the_current_session());
         }
     }
 }
\ No newline at end of file

@@ -2,11 +2,12 @@ using System.ComponentModel;
 using System.Deployment.Application;
 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 MoMoney.Infrastructure.Container;
-using MoMoney.Infrastructure.Logging;
-using MoMoney.Infrastructure.Logging.Log4NetLogging;
-using MoMoney.Infrastructure.Threading;
+using MoMoney.Infrastructure.Logging.Log4Net;
 using MoMoney.Tasks.infrastructure.updating;
 
 namespace MoMoney.boot.container.registration

@@ -1,8 +1,8 @@
+using Gorilla.Commons.Infrastructure.Eventing;
+using Gorilla.Commons.Infrastructure.Registries;
+using Gorilla.Commons.Infrastructure.Threading;
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.Container;
-using MoMoney.Infrastructure.eventing;
-using MoMoney.Infrastructure.registries;
-using MoMoney.Infrastructure.Threading;
 //using MoMoney.Infrastructure.transactions;
 using MoMoney.Infrastructure.transactions2;
 using MoMoney.Presentation.Model.Projects;

@@ -1,10 +1,10 @@
 using System;
 using System.Reflection;
+using Gorilla.Commons.Infrastructure.Reflection;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Infrastructure.Container;
 using MoMoney.Infrastructure.interceptors;
-using MoMoney.Infrastructure.reflection;
 using MoMoney.Modules.Core;
 using MoMoney.Presentation.Core;
 using MoMoney.Presentation.Model.Menu.File;

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Windows.Forms;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Testing;
 using MoMoney.Domain.Core;
 

@@ -1,5 +1,5 @@
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Utility.Core;
-using MoMoney.Infrastructure.Container;
 
 namespace MoMoney.boot.container
 {
@@ -7,7 +7,7 @@ namespace MoMoney.boot.container
     {
         public void run()
         {
-            resolve.initialize_with(null);
+            Resolve.initialize_with(null);
         }
     }
 }
\ No newline at end of file

@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Forms;
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Domain.Core;
 

@@ -1,3 +1,4 @@
+using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.boot.container.registration;
@@ -36,7 +37,7 @@ namespace MoMoney.boot.container
                 .then(new wire_up_the_reports_in_to_the(registry))
                 .run();
 
-            resolve.initialize_with(registry.build());
+            Resolve.initialize_with(registry.build());
         }
     }
 }
\ No newline at end of file

@@ -1,10 +1,10 @@
 using System;
 using System.Windows.Forms;
+using Gorilla.Commons.Infrastructure.Container;
+using Gorilla.Commons.Infrastructure.Eventing;
+using Gorilla.Commons.Infrastructure.Logging;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
-using MoMoney.Infrastructure.Container;
-using MoMoney.Infrastructure.eventing;
-using MoMoney.Infrastructure.Extensions;
 using MoMoney.Presentation.Model.messages;
 
 namespace MoMoney.boot
@@ -20,7 +20,7 @@ namespace MoMoney.boot
         void handle(Exception e)
         {
             e.add_to_log();
-            resolve.dependency_for<IEventAggregator>().publish(new UnhandledErrorOccurred(e));
+            Resolve.dependency_for<IEventAggregator>().publish(new UnhandledErrorOccurred(e));
         }
     }
 }
\ No newline at end of file