Commit fd8871e

@@ -1,18 +0,0 @@
-using Db4objects.Db4o.Config;
-using gorilla.commons.utility;
-
-namespace momoney.database.db4o
-{
-    public interface IConfigureDatabaseStep : Configuration<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,19 +0,0 @@
-using Db4objects.Db4o;
-using Db4objects.Db4o.Events;
-using gorilla.commons.utility;
-
-namespace momoney.database.db4o
-{
-    public interface IConfigureObjectContainerStep : Configuration<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;
-using momoney.database.transactions;
-
-namespace momoney.database.db4o
-{
-    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 DatabaseConnection open_connection_to(File the_path_to_the_database_file)
-        {
-            var configuration = Db4oFactory.NewConfiguration();
-            setup.configure(configuration);
-            return new ObjectDatabaseConnection(get_container(the_path_to_the_database_file, configuration));
-        }
-
-        IObjectContainer get_container(File 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

@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Db4objects.Db4o;
-using momoney.database.transactions;
-
-namespace momoney.database.db4o
-{
-    public class ObjectDatabaseConnection : DatabaseConnection
-    {
-        readonly IObjectContainer container;
-
-        public ObjectDatabaseConnection(IObjectContainer container)
-        {
-            this.container = container;
-        }
-
-        public void Dispose()
-        {
-            container.Close();
-            container.Dispose();
-        }
-
-        public IEnumerable<T> query<T>()
-        {
-            return container.Query<T>();
-        }
-
-        public IEnumerable<T> query<T>(Predicate<T> predicate)
-        {
-            return container.Query(predicate);
-        }
-
-        public void delete<T>(T entity)
-        {
-            container.Delete(entity);
-        }
-
-        public void commit()
-        {
-            container.Commit();
-        }
-
-        public void store<T>(T entity)
-        {
-            container.Store(entity);
-        }
-    }
-}
\ No newline at end of file

@@ -1,25 +0,0 @@
-//using MoMoney.Domain.accounting;
-//using MoMoney.Domain.repositories;
-
-namespace momoney.database.repositories
-{
-    //public class AccountHolderRepository : IAccountHolderRepository
-    //{
-    //    readonly ISession session;
-
-    //    public AccountHolderRepository(ISession session)
-    //    {
-    //        this.session = session;
-    //    }
-
-    //    public IEnumerable<AccountHolder> all()
-    //    {
-    //        return session.all<AccountHolder>();
-    //    }
-
-    //    public void save(AccountHolder account_holder)
-    //    {
-    //        session.save(account_holder);
-    //    }
-    //}
-}
\ No newline at end of file

@@ -1,20 +0,0 @@
-//using MoMoney.Domain.Accounting;
-//using MoMoney.Domain.repositories;
-
-namespace momoney.database.repositories
-{
-    //public class BillRepository : IBillRepository
-    //{
-    //    readonly ISession session;
-
-    //    public BillRepository(ISession session)
-    //    {
-    //        this.session = session;
-    //    }
-
-    //    public IEnumerable<Bill> all()
-    //    {
-    //        return session.all<Bill>();
-    //    }
-    //}
-}
\ No newline at end of file

@@ -1,35 +0,0 @@
-//using MoMoney.Domain.Accounting;
-//using MoMoney.Domain.repositories;
-
-namespace momoney.database.repositories
-{
-    //public class CompanyRepository : ICompanyRepository
-    //{
-    //    readonly ISession session;
-
-    //    public CompanyRepository(ISession session)
-    //    {
-    //        this.session = session;
-    //    }
-
-    //    public IEnumerable<Company> all()
-    //    {
-    //        return session.all<Company>();
-    //    }
-
-    //    public Company find_company_named(string name)
-    //    {
-    //        return all().SingleOrDefault(x => x.name.is_equal_to_ignoring_case(name));
-    //    }
-
-    //    public Company find_company_by(Guid id)
-    //    {
-    //        return all().SingleOrDefault(x => x.id.Equals(id));
-    //    }
-
-    //    public void save(Company company)
-    //    {
-    //        session.save(company);
-    //    }
-    //}
-}
\ No newline at end of file

@@ -1,20 +0,0 @@
-//using MoMoney.Domain.Accounting;
-//using MoMoney.Domain.repositories;
-
-namespace momoney.database.repositories
-{
-    //public class IncomeRepository : IIncomeRepository
-    //{
-    //    readonly ISession session;
-
-    //    public IncomeRepository(ISession session)
-    //    {
-    //        this.session = session;
-    //    }
-
-    //    public IEnumerable<Income> all()
-    //    {
-    //        return session.all<Income>();
-    //    }
-    //}
-}
\ No newline at end of file

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using gorilla.commons.utility;
-
-namespace momoney.database.transactions
-{
-    public class ChangeTracker<T> : IChangeTracker<T> where T : Identifiable<Guid>
-    {
-        readonly ITrackerEntryMapper<T> mapper;
-        readonly DatabaseCommandRegistry registry;
-        readonly IList<ITrackerEntry<T>> items;
-        readonly IList<T> to_be_deleted;
-
-        public ChangeTracker(ITrackerEntryMapper<T> mapper, DatabaseCommandRegistry registry)
-        {
-            this.mapper = mapper;
-            this.registry = registry;
-            items = new List<ITrackerEntry<T>>();
-            to_be_deleted = new List<T>();
-        }
-
-        public void register(T entity)
-        {
-            items.Add(mapper.map_from(entity));
-        }
-
-        public void delete(T entity)
-        {
-            to_be_deleted.Add(entity);
-        }
-
-        public void commit_to(IDatabase database)
-        {
-            items.each(x => commit(x, database));
-            to_be_deleted.each(x => database.apply(registry.prepare_for_deletion(x)));
-        }
-
-        public bool is_dirty()
-        {
-            return items.Count(x => x.has_changes()) > 0 || to_be_deleted.Count > 0;
-        }
-
-        public void Dispose()
-        {
-            items.Clear();
-        }
-
-        void commit(ITrackerEntry<T> entry, IDatabase database)
-        {
-            if (entry.has_changes()) database.apply(registry.prepare_for_flushing(entry.current));
-        }
-    }
-}
\ No newline at end of file

@@ -1,23 +0,0 @@
-using System;
-using Gorilla.Commons.Infrastructure.Container;
-using gorilla.commons.utility;
-
-namespace momoney.database.transactions
-{
-    public class ChangeTrackerFactory : IChangeTrackerFactory
-    {
-        readonly DatabaseCommandRegistry statement_registry;
-        readonly DependencyRegistry registry;
-
-        public ChangeTrackerFactory(DatabaseCommandRegistry statement_registry, DependencyRegistry registry)
-        {
-            this.statement_registry = statement_registry;
-            this.registry = registry;
-        }
-
-        public IChangeTracker<T> create_for<T>() where T : Identifiable<Guid>
-        {
-            return new ChangeTracker<T>(registry.get_a<ITrackerEntryMapper<T>>(), statement_registry);
-        }
-    }
-}
\ No newline at end of file

@@ -1,6 +0,0 @@
-using gorilla.commons.utility;
-
-namespace momoney.database.transactions
-{
-    public interface DatabaseCommand : Command<DatabaseConnection> {}
-}
\ No newline at end of file

@@ -1,11 +0,0 @@
-using System;
-using gorilla.commons.utility;
-
-namespace momoney.database.transactions
-{
-    public interface DatabaseCommandRegistry
-    {
-        DatabaseCommand prepare_for_deletion<T>(T entity) where T : Identifiable<Guid>;
-        DatabaseCommand prepare_for_flushing<T>(T entity) where T : Identifiable<Guid>;
-    }
-}
\ No newline at end of file

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace momoney.database.transactions
-{
-    public interface DatabaseConnection : IDisposable
-    {
-        IEnumerable<T> query<T>();
-        IEnumerable<T> query<T>(Predicate<T> predicate);
-        void delete<T>(T entity);
-        void commit();
-        void store<T>(T entity);
-    }
-}
\ No newline at end of file

@@ -1,17 +0,0 @@
-namespace momoney.database.transactions
-{
-    public class DeleteFromDatabase<T> : DatabaseCommand
-    {
-        readonly T entity;
-
-        public DeleteFromDatabase(T entity)
-        {
-            this.entity = entity;
-        }
-
-        public void run_against(DatabaseConnection connection)
-        {
-            connection.delete(entity);
-        }
-    }
-}
\ No newline at end of file

@@ -1,17 +0,0 @@
-using System;
-using gorilla.commons.utility;
-
-namespace momoney.database.transactions
-{
-    public interface IChangeTracker : IDisposable
-    {
-        bool is_dirty();
-        void commit_to(IDatabase database);
-    }
-
-    public interface IChangeTracker<T> : IChangeTracker where T : Identifiable<Guid>
-    {
-        void register(T value);
-        void delete(T entity);
-    }
-}
\ No newline at end of file

@@ -1,10 +0,0 @@
-using System;
-using gorilla.commons.utility;
-
-namespace momoney.database.transactions
-{
-    public interface IChangeTrackerFactory
-    {
-        IChangeTracker<T> create_for<T>() where T : Identifiable<Guid>;
-    }
-}
\ No newline at end of file

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using gorilla.commons.utility;
-
-namespace momoney.database.transactions
-{
-    public interface IDatabase
-    {
-        IEnumerable<T> fetch_all<T>() where T : Identifiable<Guid>;
-        void apply(DatabaseCommand command);
-    }
-}
\ No newline at end of file

@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using gorilla.commons.utility;
-
-namespace momoney.database.transactions
-{
-    public class IdentityMapProxy<Key, Value> : IIdentityMap<Key, Value> where Value : Identifiable<Guid>
-    {
-        readonly IIdentityMap<Key, Value> real_map;
-        readonly IChangeTracker<Value> change_tracker;
-
-        public IdentityMapProxy(IChangeTracker<Value> change_tracker, IIdentityMap<Key, Value> real_map)
-        {
-            this.change_tracker = change_tracker;
-            this.real_map = real_map;
-        }
-
-        public IEnumerable<Value> all()
-        {
-            return real_map.all();
-        }
-
-        public void add(Key key, Value value)
-        {
-            change_tracker.register(value);
-            real_map.add(key, value);
-        }
-
-        public void update_the_item_for(Key key, Value new_value)
-        {
-            real_map.update_the_item_for(key, new_value);
-        }
-
-        public bool contains_an_item_for(Key key)
-        {
-            return real_map.contains_an_item_for(key);
-        }
-
-        public Value item_that_belongs_to(Key key)
-        {
-            return real_map.item_that_belongs_to(key);
-        }
-
-        public void evict(Key key)
-        {
-            change_tracker.delete(real_map.item_that_belongs_to(key));
-            real_map.evict(key);
-        }
-    }
-}
\ No newline at end of file

@@ -1,59 +0,0 @@
-using System.Collections.Generic;
-
-namespace momoney.database.transactions
-{
-    public interface IIdentityMap<TKey, TValue>
-    {
-        IEnumerable<TValue> all();
-        void add(TKey key, TValue value);
-        void update_the_item_for(TKey key, TValue new_value);
-        bool contains_an_item_for(TKey key);
-        TValue item_that_belongs_to(TKey key);
-        void evict(TKey key);
-    }
-
-    public class IdentityMap<TKey, TValue> : IIdentityMap<TKey, TValue>
-    {
-        readonly IDictionary<TKey, TValue> items_in_map;
-
-        public IdentityMap() : this(new Dictionary<TKey, TValue>())
-        {
-        }
-
-        public IdentityMap(IDictionary<TKey, TValue> items_in_map)
-        {
-            this.items_in_map = items_in_map;
-        }
-
-        public IEnumerable<TValue> all()
-        {
-            return items_in_map.Values;
-        }
-
-        public void add(TKey key, TValue value)
-        {
-            items_in_map.Add(key, value);
-        }
-
-        public void update_the_item_for(TKey key, TValue new_value)
-        {
-            if (contains_an_item_for(key)) items_in_map[key] = new_value;
-            else add(key, new_value);
-        }
-
-        public bool contains_an_item_for(TKey key)
-        {
-            return items_in_map.ContainsKey(key);
-        }
-
-        public TValue item_that_belongs_to(TKey key)
-        {
-            return contains_an_item_for(key) ? items_in_map[key] : default(TValue);
-        }
-
-        public void evict(TKey key)
-        {
-            if (contains_an_item_for(key)) items_in_map.Remove(key);
-        }
-    }
-}
\ No newline at end of file

@@ -1,18 +0,0 @@
-using System;
-using gorilla.commons.utility;
-
-namespace momoney.database.transactions
-{
-    public class ObjectDatabaseCommandRegistry : DatabaseCommandRegistry
-    {
-        public DatabaseCommand prepare_for_deletion<T>(T entity) where T : Identifiable<Guid>
-        {
-            return new DeleteFromDatabase<T>(entity);
-        }
-
-        public DatabaseCommand prepare_for_flushing<T>(T entity) where T : Identifiable<Guid>
-        {
-            return new SaveOrUpdateFromDatabase<T>(entity);
-        }
-    }
-}
\ No newline at end of file

@@ -1,20 +0,0 @@
-using System;
-using gorilla.commons.utility;
-
-namespace momoney.database.transactions
-{
-    public class SaveOrUpdateFromDatabase<T> : DatabaseCommand where T : Identifiable<Guid>
-    {
-        readonly T entity;
-
-        public SaveOrUpdateFromDatabase(T entity)
-        {
-            this.entity = entity;
-        }
-
-        public void run_against(DatabaseConnection connection)
-        {
-            connection.store(entity);
-        }
-    }
-}
\ No newline at end of file

@@ -1,103 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Gorilla.Commons.Infrastructure.Logging;
-using gorilla.commons.utility;
-
-namespace momoney.database.transactions
-{
-    public interface ISession : IDisposable
-    {
-        T find<T>(Guid guid) where T : Identifiable<Guid>;
-        IEnumerable<T> all<T>() where T : Identifiable<Guid>;
-        void save<T>(T entity) where T : Identifiable<Guid>;
-        void delete<T>(T entity) where T : Identifiable<Guid>;
-        void flush();
-        bool is_dirty();
-    }
-
-    public class Session : ISession
-    {
-        ITransaction transaction;
-        readonly IDatabase database;
-        readonly IDictionary<Type, object> identity_maps;
-        long id;
-
-        public Session(ITransaction transaction, IDatabase database)
-        {
-            this.database = database;
-            this.transaction = transaction;
-            identity_maps = new Dictionary<Type, object>();
-            id = DateTime.Now.Ticks;
-        }
-
-        public T find<T>(Guid id) where T : Identifiable<Guid>
-        {
-            if (get_identity_map_for<T>().contains_an_item_for(id))
-            {
-                return get_identity_map_for<T>().item_that_belongs_to(id);
-            }
-
-            var entity = database.fetch_all<T>().Single(x => x.id.Equals(id));
-            get_identity_map_for<T>().add(id, entity);
-            return entity;
-        }
-
-        public IEnumerable<T> all<T>() where T : Identifiable<Guid>
-        {
-            database
-                .fetch_all<T>()
-                .where(x => !get_identity_map_for<T>().contains_an_item_for(x.id))
-                .each(x => get_identity_map_for<T>().add(x.id, x));
-            return get_identity_map_for<T>().all();
-        }
-
-        public void save<T>(T entity) where T : Identifiable<Guid>
-        {
-            this.log().debug("saving {0}: {1}", id, entity);
-            get_identity_map_for<T>().add(entity.id, entity);
-        }
-
-        public void delete<T>(T entity) where T : Identifiable<Guid>
-        {
-            get_identity_map_for<T>().evict(entity.id);
-        }
-
-        public void flush()
-        {
-            this.log().debug("flushing session {0}", id);
-            transaction.commit_changes();
-            transaction = null;
-        }
-
-        public bool is_dirty()
-        {
-            this.log().debug("is dirty? {0}", id);
-            return null != transaction && transaction.is_dirty();
-        }
-
-        public void Dispose()
-        {
-            if (null != transaction) transaction.rollback_changes();
-        }
-
-        IIdentityMap<Guid, T> get_identity_map_for<T>() where T : Identifiable<Guid>
-        {
-            return identity_maps.ContainsKey(typeof (T))
-                       ? identity_maps[typeof (T)].downcast_to<IIdentityMap<Guid, T>>()
-                       : create_map_for<T>();
-        }
-
-        IIdentityMap<Guid, T> create_map_for<T>() where T : Identifiable<Guid>
-        {
-            var identity_map = transaction.create_for<T>();
-            identity_maps.Add(typeof (T), identity_map);
-            return identity_map;
-        }
-
-        public override string ToString()
-        {
-            return "session: {0}".formatted_using(id);
-        }
-    }
-}
\ No newline at end of file

@@ -1,23 +0,0 @@
-using gorilla.commons.utility;
-
-namespace momoney.database.transactions
-{
-    public interface ISessionFactory : Factory<ISession> {}
-
-    public class SessionFactory : ISessionFactory
-    {
-        readonly IDatabase database;
-        readonly IChangeTrackerFactory factory;
-
-        public SessionFactory(IDatabase database, IChangeTrackerFactory factory)
-        {
-            this.database = database;
-            this.factory = factory;
-        }
-
-        public ISession create()
-        {
-            return new Session(new Transaction(database, factory), database);
-        }
-    }
-}
\ No newline at end of file

@@ -1,11 +0,0 @@
-using System;
-
-namespace momoney.database.transactions
-{
-    public class SessionNotStartedException : Exception
-    {
-        public SessionNotStartedException() : base("A session could not be found. Did you forget to open a session?")
-        {
-        }
-    }
-}
\ No newline at end of file

@@ -1,25 +0,0 @@
-namespace momoney.database.transactions
-{
-    public interface ISessionProvider
-    {
-        ISession get_the_current_session();
-    }
-
-    public class SessionProvider : ISessionProvider
-    {
-        readonly IContext context;
-        readonly IKey<ISession> session_key;
-
-        public SessionProvider(IContext context, IKey<ISession> session_key)
-        {
-            this.context = context;
-            this.session_key = session_key;
-        }
-
-        public ISession get_the_current_session()
-        {
-            if (!context.contains(session_key)) throw new SessionNotStartedException();
-            return context.value_for(session_key);
-        }
-    }
-}
\ No newline at end of file

@@ -1,47 +0,0 @@
-using System.Reflection;
-using Gorilla.Commons.Infrastructure.Logging;
-
-namespace momoney.database.transactions
-{
-    public interface ITrackerEntry<T>
-    {
-        T current { get; }
-        bool has_changes();
-    }
-
-    public class TrackerEntry<T> : ITrackerEntry<T>
-    {
-        readonly T original;
-
-        public TrackerEntry(T original, T current)
-        {
-            this.original = original;
-            this.current = current;
-        }
-
-        public T current { get; set; }
-
-        public bool has_changes()
-        {
-            this.log().debug("checking for changes");
-            var type = original.GetType();
-            foreach (var field in type.GetFields(BindingFlags.NonPublic | BindingFlags.Instance))
-            {
-                var original_value = field.GetValue(original);
-                var current_value = field.GetValue(current);
-                if (original_value == null && current_value != null)
-                {
-                    this.log().debug("{0} has changes: {1}", field, original);
-                    return true;
-                }
-                if (original_value != null && !original_value.Equals(current_value))
-                {
-                    this.log().debug("{0} has changes: {1}", field, original);
-                    return true;
-                }
-            }
-            this.log().debug("has no changes: {0}", original);
-            return false;
-        }
-    }
-}
\ No newline at end of file

@@ -1,27 +0,0 @@
-using Gorilla.Commons.Infrastructure.Cloning;
-using gorilla.commons.utility;
-
-namespace momoney.database.transactions
-{
-    public interface ITrackerEntryMapper<T> : Mapper<T, ITrackerEntry<T>> {}
-
-    public class TrackerEntryMapper<T> : ITrackerEntryMapper<T>
-    {
-        readonly IPrototype prototype;
-
-        public TrackerEntryMapper(IPrototype prototype)
-        {
-            this.prototype = prototype;
-        }
-
-        public ITrackerEntry<T> map_from(T item)
-        {
-            return new TrackerEntry<T>(create_prototype(item), item);
-        }
-
-        T create_prototype(T item)
-        {
-            return prototype.clone(item);
-        }
-    }
-}
\ No newline at end of file

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using gorilla.commons.utility;
-
-namespace momoney.database.transactions
-{
-    public interface ITransaction
-    {
-        IIdentityMap<Guid, T> create_for<T>() where T : Identifiable<Guid>;
-        void commit_changes();
-        void rollback_changes();
-        bool is_dirty();
-    }
-
-    public class Transaction : ITransaction
-    {
-        readonly IDatabase database;
-        readonly IChangeTrackerFactory factory;
-        readonly IDictionary<Type, IChangeTracker> change_trackers;
-
-        public Transaction(IDatabase database, IChangeTrackerFactory factory)
-        {
-            this.factory = factory;
-            this.database = database;
-            change_trackers = new Dictionary<Type, IChangeTracker>();
-        }
-
-        public IIdentityMap<Guid, T> create_for<T>() where T : Identifiable<Guid>
-        {
-            return new IdentityMapProxy<Guid, T>(get_change_tracker_for<T>(), new IdentityMap<Guid, T>());
-        }
-
-        public void commit_changes()
-        {
-            change_trackers.Values.where(x => x.is_dirty()).each(x => x.commit_to(database));
-        }
-
-        public void rollback_changes()
-        {
-            change_trackers.each(x => x.Value.Dispose());
-            change_trackers.Clear();
-        }
-
-        public bool is_dirty()
-        {
-            return change_trackers.Values.Count(x => x.is_dirty()) > 0;
-        }
-
-        IChangeTracker<T> get_change_tracker_for<T>() where T : Identifiable<Guid>
-        {
-            if (!change_trackers.ContainsKey(typeof (T))) change_trackers.Add(typeof (T), factory.create_for<T>());
-            return change_trackers[typeof (T)].downcast_to<IChangeTracker<T>>();
-        }
-    }
-}
\ No newline at end of file

@@ -74,51 +74,6 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DatabaseAssembly.cs" />
-    <Compile Include="db4o\ConfigureObjectContainerStep.cs" />
-    <Compile Include="repositories\AccountHolderRepository.cs" />
-    <Compile Include="repositories\BillRepository.cs" />
-    <Compile Include="repositories\CompanyRepository.cs" />
-    <Compile Include="repositories\IncomeRepository.cs" />
-    <Compile Include="db4o\ConfigureDatabaseStep.cs" />
-    <Compile Include="db4o\ConnectionFactory.cs" />
-    <Compile Include="ObjectDatabase.cs" />
-    <Compile Include="db4o\ObjectDatabaseConnection.cs" />
-    <Compile Include="IConnectionFactory.cs" />
-    <Compile Include="IDatabaseConfiguration.cs" />
-    <Compile Include="transactions\ChangeTracker.cs" />
-    <Compile Include="transactions\ChangeTrackerFactory.cs" />
-    <Compile Include="transactions\Context.cs" />
-    <Compile Include="transactions\ContextFactory.cs" />
-    <Compile Include="transactions\CurrentThread.cs" />
-    <Compile Include="transactions\DeleteFromDatabase.cs" />
-    <Compile Include="transactions\IChangeTracker.cs" />
-    <Compile Include="transactions\IChangeTrackerFactory.cs" />
-    <Compile Include="transactions\IContext.cs" />
-    <Compile Include="transactions\IDatabase.cs" />
-    <Compile Include="transactions\DatabaseConnection.cs" />
-    <Compile Include="transactions\IdentityMapProxy.cs" />
-    <Compile Include="transactions\IIdentityMap.cs" />
-    <Compile Include="transactions\IKey.cs" />
-    <Compile Include="transactions\IScopedStorage.cs" />
-    <Compile Include="transactions\DatabaseCommand.cs" />
-    <Compile Include="transactions\DatabaseCommandRegistry.cs" />
-    <Compile Include="transactions\IThread.cs" />
-    <Compile Include="transactions\PerThread.cs" />
-    <Compile Include="transactions\PerThreadScopedStorage.cs" />
-    <Compile Include="transactions\SaveOrUpdateFromDatabase.cs" />
-    <Compile Include="transactions\Session.cs" />
-    <Compile Include="transactions\SessionFactory.cs" />
-    <Compile Include="transactions\SessionNotStartedException.cs" />
-    <Compile Include="transactions\SessionProvider.cs" />
-    <Compile Include="transactions\SingletonScopedStorage.cs" />
-    <Compile Include="transactions\ObjectDatabaseCommandRegistry.cs" />
-    <Compile Include="transactions\TrackerEntry.cs" />
-    <Compile Include="transactions\TrackerEntryMapper.cs" />
-    <Compile Include="transactions\Transaction.cs" />
-    <Compile Include="transactions\TypedKey.cs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\commons\infrastructure\infrastructure.csproj">
       <Project>{AA5EEED9-4531-45F7-AFCD-AD9717D2E405}</Project>
@@ -131,6 +86,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
+    <Folder Include="transactions\" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">

@@ -1,7 +0,0 @@
-namespace momoney.database
-{
-    public class DatabaseAssembly
-    {
-        
-    }
-}
\ No newline at end of file

@@ -1,10 +0,0 @@
-using Gorilla.Commons.Infrastructure.FileSystem;
-using momoney.database.transactions;
-
-namespace momoney.database
-{
-    public interface IConnectionFactory
-    {
-        DatabaseConnection open_connection_to(File the_path_to_the_database_file);
-    }
-}
\ No newline at end of file

@@ -1,11 +0,0 @@
-using Gorilla.Commons.Infrastructure.FileSystem;
-
-namespace momoney.database
-{
-    public interface IDatabaseConfiguration
-    {
-        void open(File file);
-        void copy_to(string path);
-        void close(string name);
-    }
-}
\ No newline at end of file

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Gorilla.Commons.Infrastructure.FileSystem;
-using gorilla.commons.utility;
-using momoney.database.transactions;
-using File = Gorilla.Commons.Infrastructure.FileSystem.File;
-
-namespace momoney.database
-{
-    public class ObjectDatabase : IDatabase, IDatabaseConfiguration
-    {
-        readonly IConnectionFactory factory;
-        File path;
-
-        public ObjectDatabase(IConnectionFactory factory)
-        {
-            this.factory = factory;
-            path = new ApplicationFile(Path.GetTempFileName());
-        }
-
-        public IEnumerable<T> fetch_all<T>() where T : Identifiable<Guid>
-        {
-            using (var connection = factory.open_connection_to(path_to_database()))
-            {
-                return connection.query<T>().ToList();
-            }
-        }
-
-        public void apply(DatabaseCommand command)
-        {
-            using (var connection = factory.open_connection_to(path_to_database()))
-            {
-                command.run_against(connection);
-                connection.commit();
-            }
-        }
-
-        public void open(File file)
-        {
-            path = new ApplicationFile(Path.GetTempFileName());
-            file.copy_to(path.path);
-        }
-
-        public void copy_to(string new_path)
-        {
-            path.copy_to(new_path);
-        }
-
-        public void close(string name)
-        {
-            path.delete();
-            path = new ApplicationFile(Path.GetTempFileName());
-        }
-
-        File path_to_database()
-        {
-            return path;
-        }
-    }
-}
\ No newline at end of file

@@ -7,14 +7,12 @@ using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Infrastructure.Logging;
 using gorilla.commons.infrastructure.thirdparty.Autofac;
 using gorilla.commons.infrastructure.thirdparty.Log4Net;
+using gorilla.commons.infrastructure.threading;
 using gorilla.commons.utility;
-using MoMoney.Service.Infrastructure.Eventing;
-using MoMoney.Service.Infrastructure.Threading;
 using presentation.windows.common;
 using presentation.windows.common.messages;
+using presentation.windows.eventing;
 using presentation.windows.presenters;
-using presentation.windows.queries;
-using presentation.windows.service.infrastructure;
 using presentation.windows.views;
 using Rhino.Queues;
 
@@ -66,13 +64,11 @@ namespace presentation.windows.bootstrappers
             builder.Register<CancelCommand>();
 
             // commanding
-            builder.Register<ContainerCommandBuilder>().As<CommandBuilder>().SingletonScoped();
             builder.Register<AsynchronousCommandProcessor>().As<CommandProcessor>().SingletonScoped();
             //builder.Register<SynchronousCommandProcessor>().As<CommandProcessor>().SingletonScoped();
             builder.Register<WpfCommandBuilder>().As<UICommandBuilder>();
 
             // queries
-            builder.Register<ContainerAwareQueryBuilder>().As<QueryBuilder>();
 
             builder.Register<PublishEventHandler<AddedNewFamilyMember>>().As<Handler>();
 

@@ -1,7 +1,7 @@
 using AutoMapper;
 using presentation.windows.common;
 using presentation.windows.common.messages;
-using presentation.windows.queries;
+using presentation.windows.presenters;
 
 namespace presentation.windows.bootstrappers
 {

@@ -1,5 +1,5 @@
-using MoMoney.Service.Infrastructure.Eventing;
-using presentation.windows.common;
+using presentation.windows.common;
+using presentation.windows.eventing;
 
 namespace presentation.windows.bootstrappers
 {

@@ -1,5 +1,5 @@
 using Gorilla.Commons.Infrastructure.Container;
-using MoMoney.Service.Infrastructure.Threading;
+using gorilla.commons.infrastructure.threading;
 using presentation.windows.common;
 using presentation.windows.common.messages;
 

@@ -1,13 +1,14 @@
-using System;
-
-namespace MoMoney.Service.Infrastructure.Eventing
-{
-    public interface EventAggregator
-    {
-        void subscribe_to<Event>(EventSubscriber<Event> subscriber) where Event : IEvent;
-        void subscribe<Listener>(Listener subscriber);
-        void publish<Event>(Event the_event_to_broadcast) where Event : IEvent;
-        void publish<T>(Action<T> call) where T : class;
-        void publish<Event>() where Event : IEvent, new();
-    }
+using System;
+using presentation.windows.common;
+
+namespace presentation.windows.eventing
+{
+    public interface EventAggregator
+    {
+        void subscribe_to<Event>(EventSubscriber<Event> subscriber) where Event : IEvent;
+        void subscribe<Listener>(Listener subscriber);
+        void publish<Event>(Event the_event_to_broadcast) where Event : IEvent;
+        void publish<T>(Action<T> call) where T : class;
+        void publish<Event>() where Event : IEvent, new();
+    }
 }
\ No newline at end of file

@@ -1,7 +1,9 @@
-namespace MoMoney.Service.Infrastructure.Eventing
-{
-    public interface EventSubscriber<Event> where Event : IEvent
-    {
-        void notify(Event message);
-    }
+using presentation.windows.common;
+
+namespace presentation.windows.eventing
+{
+    public interface EventSubscriber<Event> where Event : IEvent
+    {
+        void notify(Event message);
+    }
 }
\ No newline at end of file

@@ -1,57 +1,58 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using gorilla.commons.utility;
-
-namespace MoMoney.Service.Infrastructure.Eventing
-{
-    public class SynchronizedEventAggregator : EventAggregator
-    {
-        readonly SynchronizationContext context;
-        readonly HashSet<object> subscribers = new HashSet<object>();
-        readonly object mutex = new object();
-
-        public SynchronizedEventAggregator(SynchronizationContext context)
-        {
-            this.context = context;
-        }
-
-        public void subscribe_to<Event>(EventSubscriber<Event> subscriber) where Event : IEvent
-        {
-            subscribe(subscriber);
-        }
-
-        public void subscribe<Listener>(Listener subscriber) 
-        {
-            within_lock(() => subscribers.Add(subscriber));
-        }
-
-        public void publish<Event>(Event the_event_to_broadcast) where Event : IEvent
-        {
-            var current_subscribers = subscribers.ToList();
-            process(() => current_subscribers.call_on_each<EventSubscriber<Event>>(x => x.notify(the_event_to_broadcast)));
-        }
-
-        public void publish<T>(Action<T> call) where T : class
-        {
-            var current_subscribers = subscribers.ToList();
-            process(() => current_subscribers.each(x => x.call_on(call)));
-        }
-
-        public void publish<Event>() where Event : IEvent, new()
-        {
-            publish(new Event());
-        }
-
-        void within_lock(Action action)
-        {
-            lock (mutex) action();
-        }
-
-        void process(Action action)
-        {
-            context.Send(x => action(), new object());
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using gorilla.commons.utility;
+using presentation.windows.common;
+
+namespace presentation.windows.eventing
+{
+    public class SynchronizedEventAggregator : EventAggregator
+    {
+        readonly SynchronizationContext context;
+        readonly HashSet<object> subscribers = new HashSet<object>();
+        readonly object mutex = new object();
+
+        public SynchronizedEventAggregator(SynchronizationContext context)
+        {
+            this.context = context;
+        }
+
+        public void subscribe_to<Event>(EventSubscriber<Event> subscriber) where Event : IEvent
+        {
+            subscribe(subscriber);
+        }
+
+        public void subscribe<Listener>(Listener subscriber) 
+        {
+            within_lock(() => subscribers.Add(subscriber));
+        }
+
+        public void publish<Event>(Event the_event_to_broadcast) where Event : IEvent
+        {
+            var current_subscribers = subscribers.ToList();
+            process(() => current_subscribers.call_on_each<EventSubscriber<Event>>(x => x.notify(the_event_to_broadcast)));
+        }
+
+        public void publish<T>(Action<T> call) where T : class
+        {
+            var current_subscribers = subscribers.ToList();
+            process(() => current_subscribers.each(x => x.call_on(call)));
+        }
+
+        public void publish<Event>() where Event : IEvent, new()
+        {
+            publish(new Event());
+        }
+
+        void within_lock(Action action)
+        {
+            lock (mutex) action();
+        }
+
+        void process(Action action)
+        {
+            context.Send(x => action(), new object());
+        }
+    }
 }
\ No newline at end of file

@@ -1,5 +1,5 @@
 using System;
-using MoMoney.Service.Infrastructure.Eventing;
+using presentation.windows.common;
 
 namespace presentation.windows.events
 {

@@ -1,6 +1,6 @@
-using MoMoney.Service.Infrastructure.Eventing;
+using presentation.windows.common;
 
-namespace presentation.windows.service.infrastructure
+namespace presentation.windows.events
 {
     public class UpdateOnLongRunningProcess : IEvent
     {

@@ -1,4 +1,4 @@
-using MoMoney.Service.Infrastructure.Eventing;
+using presentation.windows.eventing;
 using presentation.windows.events;
 
 namespace presentation.windows.presenters

@@ -1,7 +1,7 @@
 using System;
 using gorilla.commons.utility;
 
-namespace presentation.windows.queries
+namespace presentation.windows.presenters
 {
     public class PersonDetails
     {

@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using gorilla.commons.utility;
-using MoMoney.Service.Infrastructure.Eventing;
 using presentation.windows.common;
 using presentation.windows.common.messages;
+using presentation.windows.eventing;
 using presentation.windows.events;
-using presentation.windows.queries;
 
 namespace presentation.windows.presenters
 {

@@ -1,6 +1,6 @@
 using System.Threading;
-using MoMoney.Service.Infrastructure.Eventing;
-using presentation.windows.service.infrastructure;
+using presentation.windows.eventing;
+using presentation.windows.events;
 
 namespace presentation.windows.presenters
 {

@@ -1,25 +0,0 @@
-using System;
-using Gorilla.Commons.Infrastructure.Container;
-using momoney.service.infrastructure.transactions;
-
-namespace presentation.windows.queries
-{
-    public class ContainerAwareQueryBuilder : QueryBuilder
-    {
-        IUnitOfWorkFactory factory;
-
-        public ContainerAwareQueryBuilder(IUnitOfWorkFactory factory)
-        {
-            this.factory = factory;
-        }
-
-        public void build<Query>(Action<Query> action) where Query : class
-        {
-            using (var unit_of_work = factory.create())
-            {
-                action(Resolve.the<Query>());
-                unit_of_work.commit();
-            }
-        }
-    }
-}
\ No newline at end of file

@@ -1,9 +0,0 @@
-using System;
-
-namespace presentation.windows.queries
-{
-    public interface QueryBuilder
-    {
-        void build<Query>(Action<Query> action) where Query : class;
-    }
-}
\ No newline at end of file

@@ -1,15 +0,0 @@
-using gorilla.commons.utility;
-
-namespace presentation.windows.service.infrastructure
-{
-    public interface CommandBuilder
-    {
-        CommandBuilder<TData> prepare<TData>(TData data);
-        Command build<TCommand>(string message) where TCommand : Command;
-    }
-
-    public interface CommandBuilder<T>
-    {
-        Command build<TCommand>(string message) where TCommand : Command<T>;
-    }
-}
\ No newline at end of file

@@ -1,52 +0,0 @@
-using System;
-using Gorilla.Commons.Infrastructure.Container;
-using gorilla.commons.utility;
-using MoMoney.Service.Infrastructure.Eventing;
-using momoney.service.infrastructure.transactions;
-
-namespace presentation.windows.service.infrastructure
-{
-    public class ContainerAwareCommandBuilder<T> : CommandBuilder<T>, Command
-    {
-        readonly T data;
-        Action action;
-        EventAggregator event_broker;
-        IUnitOfWorkFactory factory;
-
-        public ContainerAwareCommandBuilder(T data, EventAggregator event_broker, IUnitOfWorkFactory factory)
-        {
-            this.data = data;
-            this.factory = factory;
-            this.event_broker = event_broker;
-        }
-
-        public Command build<TCommand>(string message) where TCommand : Command<T>
-        {
-            action = () =>
-            {
-                event_broker.publish(new UpdateOnLongRunningProcess
-                                     {
-                                         message = message,
-                                         percent_complete = 0,
-                                     });
-                //need to resolve the command on the background thread in order to resolve the thread specific session.
-                Resolve.the<TCommand>().run_against(data);
-                event_broker.publish(new UpdateOnLongRunningProcess
-                                     {
-                                         percent_complete = 100,
-                                     });
-            };
-
-            return this;
-        }
-
-        public void run()
-        {
-            using (var unit_of_work = factory.create())
-            {
-                action();
-                unit_of_work.commit();
-            }
-        }
-    }
-}
\ No newline at end of file

@@ -1,29 +0,0 @@
-using Gorilla.Commons.Infrastructure.Container;
-using gorilla.commons.utility;
-using MoMoney.Service.Infrastructure.Eventing;
-using momoney.service.infrastructure.transactions;
-
-namespace presentation.windows.service.infrastructure
-{
-    public class ContainerCommandBuilder : CommandBuilder
-    {
-        EventAggregator event_aggregator;
-        IUnitOfWorkFactory unit_of_work_factory;
-
-        public ContainerCommandBuilder(EventAggregator event_aggregator, IUnitOfWorkFactory unit_of_work_factory)
-        {
-            this.event_aggregator = event_aggregator;
-            this.unit_of_work_factory = unit_of_work_factory;
-        }
-
-        public CommandBuilder<T> prepare<T>(T data)
-        {
-            return new ContainerAwareCommandBuilder<T>(data, event_aggregator, unit_of_work_factory);
-        }
-
-        public Command build<T>(string message) where T : Command
-        {
-            return new NamedCommand<T>(message, Resolve.the<T>());
-        }
-    }
-}
\ No newline at end of file

@@ -1,26 +0,0 @@
-using gorilla.commons.utility;
-
-namespace presentation.windows.service.infrastructure
-{
-    public class NamedCommand<T> : Command where T : Command
-    {
-        readonly string message;
-        readonly T command;
-
-        public NamedCommand(string message, T command)
-        {
-            this.message = message;
-            this.command = command;
-        }
-
-        public void run()
-        {
-            command.run();
-        }
-
-        public override string ToString()
-        {
-            return message;
-        }
-    }
-}
\ No newline at end of file

@@ -1,6 +1,5 @@
 using System;
 using System.Windows.Controls;
-using presentation.windows.presenters;
 
 namespace presentation.windows.views
 {

@@ -1,13 +1,10 @@
-<Window x:Class="presentation.windows.views.ShellWindow"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ui="clr-namespace:presentation.windows.views" Title="MoMoney - (ALPHA)" MinWidth="1024" MinHeight="768" WindowStartupLocation="CenterScreen" WindowState="Maximized">
-    <DockPanel VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-        <ui:MainMenu x:Name="Menu" DockPanel.Dock="Top" HorizontalAlignment="Right">
-        </ui:MainMenu>
-        <ui:StatusBarRegion x:Name="StatusBar" DockPanel.Dock="Bottom"></ui:StatusBarRegion>
-        <StackPanel>
-            <ui:SelectedFamilyMemberRegion x:Name="SelectedFamilyMember"></ui:SelectedFamilyMemberRegion>
-            <TabControl Name="Tabs"></TabControl>
-        </StackPanel>
-    </DockPanel>
-</Window>
+<Window x:Class="presentation.windows.views.ShellWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ui="clr-namespace:presentation.windows.views" Title="MoMoney - (ALPHA)" MinWidth="1024" MinHeight="768" WindowStartupLocation="CenterScreen" WindowState="Maximized">
+	<DockPanel VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+		<ui:MainMenu x:Name="Menu" DockPanel.Dock="Top" HorizontalAlignment="Right"></ui:MainMenu>
+		<ui:StatusBarRegion x:Name="StatusBar" DockPanel.Dock="Bottom"></ui:StatusBarRegion>
+		<StackPanel>
+			<ui:SelectedFamilyMemberRegion x:Name="SelectedFamilyMember"></ui:SelectedFamilyMemberRegion>
+			<TabControl Name="Tabs"></TabControl>
+		</StackPanel>
+	</DockPanel>
+</Window>
\ No newline at end of file

@@ -1,4 +1,4 @@
-namespace presentation.windows.presenters
+namespace presentation.windows
 {
     public class CancelCommand : UICommand<DialogPresenter>
     {

@@ -149,6 +149,9 @@
       <SubType>Designer</SubType>
     </Page>
     <Compile Include="bootstrappers\PublishEventHandler.cs" />
+    <Compile Include="eventing\EventAggregator.cs" />
+    <Compile Include="eventing\EventSubscriber.cs" />
+    <Compile Include="eventing\SynchronizedEventAggregator.cs" />
     <Compile Include="views\ShellWindow.xaml.cs">
       <DependentUpon>ShellWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -160,28 +163,22 @@
     <Compile Include="bootstrappers\ConfigureMappings.cs" />
     <Compile Include="bootstrappers\StartServiceBus.cs" />
     <Compile Include="events\SelectedFamilyMember.cs" />
-    <Compile Include="service\infrastructure\UpdateOnLongRunningProcess.cs" />
+    <Compile Include="events\UpdateOnLongRunningProcess.cs" />
     <Compile Include="Dialog.cs" />
     <Compile Include="DialogPresenter.cs" />
     <Compile Include="presenters\AccountPresenter.cs" />
     <Compile Include="presenters\AddFamilyMemberPresenter.cs" />
-    <Compile Include="service\infrastructure\CommandBuilder.cs" />
     <Compile Include="presenters\AddNewAccountPresenter.cs" />
-    <Compile Include="presenters\CancelCommand.cs" />
+    <Compile Include="CancelCommand.cs" />
     <Compile Include="presenters\CompensationPresenter.cs" />
-    <Compile Include="service\infrastructure\ContainerCommandBuilder.cs" />
-    <Compile Include="service\infrastructure\NamedCommand.cs" />
-    <Compile Include="service\infrastructure\ContainerAwareCommandBuilder.cs" />
-    <Compile Include="presenters\UICommand.cs" />
-    <Compile Include="presenters\UICommandBuilder.cs" />
+    <Compile Include="UICommand.cs" />
+    <Compile Include="UICommandBuilder.cs" />
     <Compile Include="presenters\WpfBindingExtensinos.cs" />
     <Compile Include="presenters\WpfCommandBuilder.cs" />
-    <Compile Include="queries\ContainerAwareQueryBuilder.cs" />
     <Compile Include="presenters\SelectedFamilyMemberPresenter.cs" />
     <Compile Include="presenters\StatusBarPresenter.cs" />
-    <Compile Include="presenters\Observable.cs" />
-    <Compile Include="queries\PersonDetails.cs" />
-    <Compile Include="queries\QueryBuilder.cs" />
+    <Compile Include="Observable.cs" />
+    <Compile Include="presenters\PersonDetails.cs" />
     <Compile Include="View.cs" />
     <Compile Include="views\AccountTab.xaml.cs">
       <DependentUpon>AccountTab.xaml</DependentUpon>
@@ -215,7 +212,7 @@
     </Compile>
     <Compile Include="Tab.cs" />
     <Compile Include="TabPresenter.cs" />
-    <Compile Include="presenters\IObservableCommand.cs" />
+    <Compile Include="IObservableCommand.cs" />
     <Compile Include="views\ErrorWindow.xaml.cs">
       <DependentUpon>ErrorWindow.xaml</DependentUpon>
     </Compile>
@@ -224,7 +221,7 @@
     </Compile>
     <Compile Include="views\MainMenu.cs" />
     <Compile Include="views\MenuItemExtensions.cs" />
-    <Compile Include="presenters\SimpleCommand.cs" />
+    <Compile Include="SimpleCommand.cs" />
     <Compile Include="views\StatusBarRegion.xaml.cs">
       <DependentUpon>StatusBarRegion.xaml</DependentUpon>
     </Compile>
@@ -258,9 +255,9 @@
       <Project>{DD8FD29E-7424-415C-9BA3-7D9F6ECBA161}</Project>
       <Name>utility</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\presentation.windows.common\presentation.windows.common.csproj">
+    <ProjectReference Include="..\..\presentation.windows.common\common.csproj">
       <Project>{72B22B1E-1B62-41A6-9392-BD5283D17F79}</Project>
-      <Name>presentation.windows.common</Name>
+      <Name>common</Name>
     </ProjectReference>
     <ProjectReference Include="..\service.infrastructure\service.infrastructure.csproj">
       <Project>{81412692-F3EE-4FBF-A7C7-69454DD1BD46}</Project>
@@ -305,9 +302,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="infrastructure\" />
-    <Folder Include="service\application\" />
-    <Folder Include="service\domain\" />
+    <Folder Include="presentation\" />
   </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,6 @@
 using System.Windows.Input;
 
-namespace presentation.windows.presenters
+namespace presentation.windows
 {
     public interface IObservableCommand : ICommand
     {

@@ -3,7 +3,7 @@ using System.ComponentModel;
 using System.Linq.Expressions;
 using gorilla.commons.utility;
 
-namespace presentation.windows.presenters
+namespace presentation.windows
 {
     public abstract class Observable<T> : INotifyPropertyChanged
     {

@@ -1,6 +1,6 @@
 using System;
 
-namespace presentation.windows.presenters
+namespace presentation.windows
 {
     public class SimpleCommand : IObservableCommand
     {

@@ -1,4 +1,4 @@
-namespace presentation.windows.presenters
+namespace presentation.windows
 {
     public interface UICommand
     {

@@ -1,4 +1,4 @@
-namespace presentation.windows.presenters
+namespace presentation.windows
 {
     public interface UICommandBuilder
     {

@@ -1,6 +1,6 @@
 using System.Windows;
 using System.Windows.Controls;
-using MoMoney.Service.Infrastructure.Eventing;
+using presentation.windows.eventing;
 
 namespace presentation.windows
 {

@@ -1,26 +0,0 @@
-using System;
-using System.Diagnostics;
-
-namespace MoMoney.Service.Infrastructure.debugging
-{
-    static public class Launch
-    {
-        static public void the_debugger()
-        {
-#if DEBUG
-            if (Debugger.IsAttached) Debugger.Break();
-            else Debugger.Launch();
-#endif
-        }
-
-        static public void the_debugger_if(Func<bool> condition)
-        {
-#if DEBUG
-            if (!condition()) return;
-
-            if (Debugger.IsAttached) Debugger.Break();
-            else Debugger.Launch();
-#endif
-        }
-    }
-}
\ No newline at end of file

@@ -1,6 +0,0 @@
-namespace MoMoney.Service.Infrastructure.Eventing
-{
-    public interface IEvent
-    {
-    }
-}
\ No newline at end of file

@@ -1,8 +0,0 @@
-namespace momoney.service.infrastructure.logging
-{
-    public interface ILogFileTasks
-    {
-        string get_the_contents_of_the_log_file();
-        string get_the_path_to_the_log_file();
-    }
-}
\ No newline at end of file

@@ -1,27 +0,0 @@
-using System.IO;
-using Gorilla.Commons.Infrastructure.Reflection;
-using momoney.service.infrastructure.logging;
-
-namespace MoMoney.Service.Infrastructure.Logging
-{
-    public class LogFileTasks : ILogFileTasks
-    {
-        public string get_the_contents_of_the_log_file()
-        {
-            using (
-                var file_stream = new FileStream(get_the_path_to_the_log_file(), FileMode.Open, FileAccess.Read,
-                                                 FileShare.ReadWrite))
-            {
-                using (var reader = new StreamReader(file_stream))
-                {
-                    return reader.ReadToEnd();
-                }
-            }
-        }
-
-        public string get_the_path_to_the_log_file()
-        {
-            return Path.Combine(this.startup_directory(), @"logs\log.txt");
-        }
-    }
-}
\ No newline at end of file

@@ -1,20 +0,0 @@
-using System.Security.Principal;
-using gorilla.commons.utility;
-
-namespace MoMoney.Service.Infrastructure.Security
-{
-    public class IsInRole : Specification<IPrincipal>
-    {
-        readonly Role role;
-
-        public IsInRole(Role role)
-        {
-            this.role = role;
-        }
-
-        public bool is_satisfied_by(IPrincipal item)
-        {
-            return item.IsInRole(role);
-        }
-    }
-}
\ No newline at end of file