Commit dcfbbb4

@@ -2,7 +2,7 @@
 using Autofac;
 using gorilla.infrastructure.container;
 
-namespace desktop.ui.bootstrappers
+namespace solidware.financials.windows.ui.bootstrappers
 {
     public class AutofacDependencyRegistry : DependencyRegistry
     {

@@ -2,17 +2,19 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Windows.Threading;
 using Autofac;
-using desktop.ui.eventing;
-using desktop.ui.handlers;
-using desktop.ui.handlers.orm;
-using desktop.ui.messages.@private;
-using desktop.ui.presenters;
-using desktop.ui.views;
 using gorilla.infrastructure.container;
 using gorilla.infrastructure.threading;
 using gorilla.utility;
-
-namespace desktop.ui.bootstrappers
+using solidware.financials.infrastructure;
+using solidware.financials.infrastructure.eventing;
+using solidware.financials.messages;
+using solidware.financials.service.handlers;
+using solidware.financials.service.orm;
+using solidware.financials.windows.ui.handlers;
+using solidware.financials.windows.ui.presenters;
+using solidware.financials.windows.ui.views;
+
+namespace solidware.financials.windows.ui.bootstrappers
 {
     public static class Bootstrapper
     {

@@ -1,8 +1,8 @@
 using System.Windows;
-using desktop.ui.presenters;
-using desktop.ui.views;
+using solidware.financials.windows.ui.presenters;
+using solidware.financials.windows.ui.views;
 
-namespace desktop.ui.bootstrappers
+namespace solidware.financials.windows.ui.bootstrappers
 {
     public class ComposeShell : NeedStartup
     {

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
-using desktop.ui.handlers.domain;
-using desktop.ui.model;
-using desktop.ui.presenters;
 using gorilla.utility;
+using solidware.financials.messages;
+using solidware.financials.service.domain;
+using solidware.financials.windows.ui.model;
 
-namespace desktop.ui.bootstrappers
+namespace solidware.financials.windows.ui.bootstrappers
 {
     public class ConfigureMappings : NeedStartup
     {

@@ -1,6 +1,6 @@
 using gorilla.utility;
 
-namespace desktop.ui.bootstrappers
+namespace solidware.financials.windows.ui.bootstrappers
 {
     public class DefaultMapper : Mapper
     {

@@ -1,6 +1,6 @@
 using gorilla.utility;
 
-namespace desktop.ui.bootstrappers
+namespace solidware.financials.windows.ui.bootstrappers
 {
     public interface NeedsShutdown : Command {}
 }
\ No newline at end of file

@@ -1,6 +1,6 @@
 using gorilla.utility;
 
-namespace desktop.ui.bootstrappers
+namespace solidware.financials.windows.ui.bootstrappers
 {
     public interface NeedStartup : Command {}
 }
\ No newline at end of file

@@ -1,8 +1,8 @@
-using desktop.ui.eventing;
-using desktop.ui.presenters;
 using gorilla.infrastructure.container;
+using solidware.financials.infrastructure.eventing;
+using solidware.financials.windows.ui.presenters;
 
-namespace desktop.ui.bootstrappers
+namespace solidware.financials.windows.ui.bootstrappers
 {
     public class WireUpSubscribers : NeedStartup
     {

@@ -1,7 +1,7 @@
 using System;
-using desktop.ui.eventing;
+using solidware.financials.infrastructure.eventing;
 
-namespace desktop.ui.events
+namespace solidware.financials.windows.ui.events
 {
     public class SelectedFamilyMember : Event
     {

@@ -1,6 +1,6 @@
-using desktop.ui.eventing;
+using solidware.financials.infrastructure.eventing;
 
-namespace desktop.ui.events
+namespace solidware.financials.windows.ui.events
 {
     public class UpdateOnLongRunningProcess : Event
     {

@@ -1,6 +1,7 @@
-using desktop.ui.eventing;
+using solidware.financials.infrastructure;
+using solidware.financials.infrastructure.eventing;
 
-namespace desktop.ui.handlers
+namespace solidware.financials.windows.ui.handlers
 {
     public class PublishEventHandler<T> : Handles<T> where T : Event
     {

@@ -1,7 +1,7 @@
 using System;
 using gorilla.utility;
 
-namespace desktop.ui.model
+namespace solidware.financials.windows.ui.model
 {
     public class PersonDetails
     {

@@ -1,4 +1,4 @@
-namespace desktop.ui.model
+namespace solidware.financials.windows.ui.model
 {
     public class TaxesForIndividual : Observable<TaxesForIndividual>
     {

@@ -1,8 +1,9 @@
 using System;
-using desktop.ui.messages.@private;
 using gorilla.utility;
+using solidware.financials.infrastructure;
+using solidware.financials.messages;
 
-namespace desktop.ui.presenters
+namespace solidware.financials.windows.ui.presenters
 {
     public class AddFamilyMemberPresenter : DialogPresenter
     {

@@ -1,7 +1,8 @@
 using System;
-using desktop.ui.messages.@private;
+using solidware.financials.infrastructure;
+using solidware.financials.messages;
 
-namespace desktop.ui.presenters
+namespace solidware.financials.windows.ui.presenters
 {
     public class AddNewIncomeViewModel : DialogPresenter
     {

@@ -1,6 +1,6 @@
 using System;
 
-namespace desktop.ui.presenters
+namespace solidware.financials.windows.ui.presenters
 {
     public class DisplayCanadianTaxInformationViewModel : DialogPresenter
     {

@@ -1,7 +1,7 @@
-using desktop.ui.eventing;
-using desktop.ui.events;
+using solidware.financials.infrastructure.eventing;
+using solidware.financials.windows.ui.events;
 
-namespace desktop.ui.presenters
+namespace solidware.financials.windows.ui.presenters
 {
     public class IfFamilyMemberIsSelected : UISpecification<AddNewIncomeViewModel>,
                                             EventSubscriber<SelectedFamilyMember>

@@ -1,11 +1,13 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using desktop.ui.eventing;
-using desktop.ui.events;
-using desktop.ui.model;
 using gorilla.utility;
+using solidware.financials.infrastructure;
+using solidware.financials.infrastructure.eventing;
+using solidware.financials.messages;
+using solidware.financials.windows.ui.events;
+using solidware.financials.windows.ui.model;
 
-namespace desktop.ui.presenters
+namespace solidware.financials.windows.ui.presenters
 {
     public class SelectedFamilyMemberPresenter : Observable<SelectedFamilyMemberPresenter>, Presenter, EventSubscriber<AddedNewFamilyMember>
     {

@@ -1,8 +1,8 @@
 using System.Threading;
-using desktop.ui.eventing;
-using desktop.ui.events;
+using solidware.financials.infrastructure.eventing;
+using solidware.financials.windows.ui.events;
 
-namespace desktop.ui.presenters
+namespace solidware.financials.windows.ui.presenters
 {
     public class StatusBarPresenter : Observable<StatusBarPresenter>, Presenter, EventSubscriber<UpdateOnLongRunningProcess>
     {

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
-using desktop.ui.eventing;
-using desktop.ui.events;
-using desktop.ui.messages.@private;
-using desktop.ui.model;
+using solidware.financials.infrastructure.eventing;
+using solidware.financials.messages;
+using solidware.financials.windows.ui.events;
+using solidware.financials.windows.ui.model;
 
-namespace desktop.ui.presenters
+namespace solidware.financials.windows.ui.presenters
 {
     public class TaxSummaryPresenter : Observable<TaxSummaryPresenter>, TabPresenter, EventSubscriber<AddIncomeCommandMessage>, EventSubscriber<SelectedFamilyMember>
     {

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
-namespace desktop.ui.presenters
+namespace solidware.financials.windows.ui.presenters
 {
     static public class WpfBindingExtensinos
     {

@@ -1,6 +1,6 @@
 using gorilla.infrastructure.container;
 
-namespace desktop.ui.presenters
+namespace solidware.financials.windows.ui.presenters
 {
     public class WPFCommandBuilder : UICommandBuilder
     {

@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2011.3.17.1750")]
-[assembly: AssemblyFileVersion("2011.3.17.1750")]
+[assembly: AssemblyVersion("2011.3.17.1758")]
+[assembly: AssemblyFileVersion("2011.3.17.1758")]

@@ -1,4 +1,4 @@
-<Window x:Class="desktop.ui.views.AddFamilyMemberDialog"
+<Window x:Class="solidware.financials.windows.ui.views.AddFamilyMemberDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Title="Add A Family Member" ShowInTaskbar="False" WindowStartupLocation="CenterScreen" Width="400" Height="170">
     <DockPanel>

@@ -1,7 +1,7 @@
 using System.Windows;
-using desktop.ui.presenters;
+using solidware.financials.windows.ui.presenters;
 
-namespace desktop.ui.views
+namespace solidware.financials.windows.ui.views
 {
     public partial class AddFamilyMemberDialog : Dialog<AddFamilyMemberPresenter>
     {

@@ -1,4 +1,4 @@
-<Window x:Class="desktop.ui.views.AddNewIncomeDialog"
+<Window x:Class="solidware.financials.windows.ui.views.AddNewIncomeDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Add Income" Width="400" Height="100"  WindowStartupLocation="CenterOwner">

@@ -1,7 +1,7 @@
 using System.Windows;
-using desktop.ui.presenters;
+using solidware.financials.windows.ui.presenters;
 
-namespace desktop.ui.views
+namespace solidware.financials.windows.ui.views
 {
     public partial class AddNewIncomeDialog : Dialog<AddNewIncomeViewModel>
     {

@@ -1,4 +1,4 @@
-<Window x:Class="desktop.ui.views.DisplayCanadianTaxInformationDialog"
+<Window x:Class="solidware.financials.windows.ui.views.DisplayCanadianTaxInformationDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="DisplayCanadianTaxInformationDialog">

@@ -1,8 +1,8 @@
 using System;
 using System.Windows;
-using desktop.ui.presenters;
+using solidware.financials.windows.ui.presenters;
 
-namespace desktop.ui.views
+namespace solidware.financials.windows.ui.views
 {
     public partial class DisplayCanadianTaxInformationDialog : Dialog<DisplayCanadianTaxInformationViewModel>
     {

@@ -1,4 +1,4 @@
-<Window x:Class="desktop.ui.views.ErrorWindow"
+<Window x:Class="solidware.financials.windows.ui.views.ErrorWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     Title="Oops... I'm sorry but an un-expected error occurred." Width="600">

@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace desktop.ui.views
+namespace solidware.financials.windows.ui.views
 {
     public partial class ErrorWindow : Window
     {

@@ -3,7 +3,7 @@ using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace desktop.ui.views
+namespace solidware.financials.windows.ui.views
 {
     public class ImageButton : System.Windows.Controls.Button
     {

@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace desktop.ui.views
+namespace solidware.financials.windows.ui.views
 {
     public class MainMenu : Menu
     {

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Controls;
 
-namespace desktop.ui.views
+namespace solidware.financials.windows.ui.views
 {
     static public class MenuItemExtensions
     {

@@ -1,4 +1,4 @@
-<UserControl x:Class="desktop.ui.views.SelectedFamilyMemberRegion"
+<UserControl x:Class="solidware.financials.windows.ui.views.SelectedFamilyMemberRegion"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" MinWidth="1024">
 <Expander>

@@ -1,6 +1,6 @@
-using desktop.ui.presenters;
+using solidware.financials.windows.ui.presenters;
 
-namespace desktop.ui.views
+namespace solidware.financials.windows.ui.views
 {
     public partial class SelectedFamilyMemberRegion : View<SelectedFamilyMemberPresenter>
     {

@@ -1,4 +1,4 @@
-<Window x:Class="desktop.ui.views.ShellWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ui="clr-namespace:desktop.ui.views" Title="MoMoney - (ALPHA)" MinWidth="1024" MinHeight="768" WindowStartupLocation="CenterScreen" WindowState="Maximized">
+<Window x:Class="solidware.financials.windows.ui.views.ShellWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ui="clr-namespace:solidware.financials.windows.ui.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>

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Windows;
 using gorilla.utility;
 
-namespace desktop.ui.views
+namespace solidware.financials.windows.ui.views
 {
     public partial class ShellWindow : RegionManager
     {

@@ -1,4 +1,4 @@
-<UserControl x:Class="desktop.ui.views.StatusBarRegion"
+<UserControl x:Class="solidware.financials.windows.ui.views.StatusBarRegion"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StatusBar HorizontalAlignment="Right">

@@ -1,6 +1,6 @@
-using desktop.ui.presenters;
+using solidware.financials.windows.ui.presenters;
 
-namespace desktop.ui.views
+namespace solidware.financials.windows.ui.views
 {
     public partial class StatusBarRegion : View<StatusBarPresenter>
     {

@@ -1,4 +1,4 @@
-<UserControl x:Class="desktop.ui.views.TaxSummaryTab"
+<UserControl x:Class="solidware.financials.windows.ui.views.TaxSummaryTab"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

@@ -1,6 +1,6 @@
-using desktop.ui.presenters;
+using solidware.financials.windows.ui.presenters;
 
-namespace desktop.ui.views
+namespace solidware.financials.windows.ui.views
 {
     public partial class TaxSummaryTab : Tab<TaxSummaryPresenter>
     {

@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public interface ApplicationController : DialogLauncher
     {

@@ -1,4 +1,4 @@
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public class CancelCommand : UICommand<DialogPresenter>
     {

@@ -1,4 +1,4 @@
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public interface Dialog<TPresenter> : View<TPresenter> where TPresenter : DialogPresenter
     {

@@ -1,6 +1,6 @@
 using System;
 
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public interface DialogPresenter : Presenter
     {

@@ -1,6 +1,6 @@
 using System.Windows.Input;
 
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public interface IObservableCommand : ICommand
     {

@@ -3,7 +3,7 @@ using System.ComponentModel;
 using System.Linq.Expressions;
 using gorilla.utility;
 
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public abstract class Observable<T> : INotifyPropertyChanged
     {

@@ -1,4 +1,4 @@
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public interface Presenter
     {

@@ -1,4 +1,4 @@
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public interface PresenterFactory
     {

@@ -2,11 +2,11 @@
 using System.Security.Principal;
 using System.Windows;
 using System.Windows.Threading;
-using desktop.ui.bootstrappers;
-using desktop.ui.views;
 using gorilla.infrastructure.logging;
+using solidware.financials.windows.ui.bootstrappers;
+using solidware.financials.windows.ui.views;
 
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     static public class Program
     {

@@ -1,7 +1,7 @@
 using System;
 using System.Windows;
 
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public interface RegionManager
     {

@@ -1,6 +1,6 @@
 using System;
 
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public class SimpleCommand : IObservableCommand
     {

@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>solidware.financials.windows.ui</RootNamespace>
-    <AssemblyName>financials</AssemblyName>
+    <AssemblyName>solidware.financials</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -217,9 +217,7 @@
       <Name>service</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="messages\private\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

@@ -1,4 +1,4 @@
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public interface Tab<Presenter> : View<Presenter> where Presenter : TabPresenter {}
 }
\ No newline at end of file

@@ -1,4 +1,4 @@
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public interface TabPresenter : Presenter
     {

@@ -1,6 +1,6 @@
 using gorilla.utility;
 
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public interface UICommand
     {

@@ -1,4 +1,4 @@
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public interface UICommandBuilder
     {

@@ -1,6 +1,6 @@
 using gorilla.utility;
 
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public interface UISpecification
     {

@@ -1,4 +1,4 @@
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public interface View<TPresenter> where TPresenter : Presenter {}
 }
\ No newline at end of file

@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public class WPFApplication : Application {}
 }
\ No newline at end of file

@@ -1,8 +1,8 @@
 using System.Windows;
 using System.Windows.Controls;
-using desktop.ui.eventing;
+using solidware.financials.infrastructure.eventing;
 
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public class WpfApplicationController : ApplicationController
     {
@@ -41,9 +41,9 @@ namespace desktop.ui
             dialog.open();
         }
 
-        public void load_region<Presenter, Region>() where Presenter : ui.Presenter where Region : FrameworkElement, View<Presenter>, new()
+        public void load_region<TPresenter, Region>() where TPresenter : Presenter where Region : FrameworkElement, View<TPresenter>, new()
         {
-            var presenter = factory.create<Presenter>();
+            var presenter = factory.create<TPresenter>();
             event_aggregator.subscribe(presenter);
             presenter.present();
             region_manager.region<Region>(x =>

@@ -1,6 +1,6 @@
 using gorilla.infrastructure.container;
 
-namespace desktop.ui
+namespace solidware.financials.windows.ui
 {
     public class WPFPresenterFactory : PresenterFactory
     {

@@ -1,4 +1,4 @@
-namespace desktop.ui.eventing
+namespace solidware.financials.infrastructure.eventing
 {
     public interface Event
     {

@@ -1,6 +1,6 @@
 using System;
 
-namespace desktop.ui.eventing
+namespace solidware.financials.infrastructure.eventing
 {
     public interface EventAggregator
     {

@@ -1,4 +1,4 @@
-namespace desktop.ui.eventing
+namespace solidware.financials.infrastructure.eventing
 {
     public interface EventSubscriber<Event> where Event : eventing.Event
     {

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading;
 using gorilla.utility;
 
-namespace desktop.ui.eventing
+namespace solidware.financials.infrastructure.eventing
 {
     public class SynchronizedEventAggregator : EventAggregator
     {

@@ -1,4 +1,4 @@
-namespace desktop.ui.handlers
+namespace solidware.financials.infrastructure
 {
     public interface Handles<T>
     {

@@ -1,9 +1,8 @@
 using System;
-using desktop.ui.handlers;
 using gorilla.infrastructure.container;
 using gorilla.utility;
 
-namespace desktop.ui
+namespace solidware.financials.infrastructure
 {
     public class InMemoryServiceBus : ServiceBus
     {

@@ -1,6 +1,6 @@
 using System;
 
-namespace desktop.ui
+namespace solidware.financials.infrastructure
 {
     public interface ServiceBus
     {

@@ -1,7 +1,7 @@
 using System;
-using desktop.ui.eventing;
+using solidware.financials.infrastructure.eventing;
 
-namespace desktop.ui.presenters
+namespace solidware.financials.messages
 {
     public class AddedNewFamilyMember : Event
     {

@@ -1,6 +1,6 @@
-using desktop.ui.eventing;
+using solidware.financials.infrastructure.eventing;
 
-namespace desktop.ui.messages.@private
+namespace solidware.financials.messages
 {
     public class AddIncomeCommandMessage : Event
     {

@@ -1,6 +1,6 @@
 using System;
 
-namespace desktop.ui.messages.@private
+namespace solidware.financials.messages
 {
     public class FamilyMemberToAdd
     {

@@ -1,4 +1,4 @@
-namespace desktop.ui.presenters
+namespace solidware.financials.messages
 {
     public class FindAllFamily
     {

@@ -8,8 +8,8 @@
     <ProjectGuid>{C3DF753C-7BB7-48E0-B87D-D37ED47EDF92}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>messages</RootNamespace>
-    <AssemblyName>messages</AssemblyName>
+    <RootNamespace>solidware.financials.messages</RootNamespace>
+    <AssemblyName>solidware.financials.messages</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>

@@ -1,7 +1,7 @@
 using System;
 using gorilla.utility;
 
-namespace desktop.ui.handlers.domain
+namespace solidware.financials.service.domain
 {
     public class Entity : IEquatable<Entity>, Identifiable<Guid>
     {

@@ -1,6 +1,6 @@
 using gorilla.utility;
 
-namespace desktop.ui.handlers.domain
+namespace solidware.financials.service.domain
 {
     public class Person : Entity
     {

@@ -1,7 +1,8 @@
 using System;
-using desktop.ui.messages.@private;
+using solidware.financials.infrastructure;
+using solidware.financials.messages;
 
-namespace desktop.ui.handlers
+namespace solidware.financials.service.handlers
 {
     public class AddIncomeCommandMessageHandler : Handles<AddIncomeCommandMessage>
     {

@@ -1,9 +1,9 @@
-using desktop.ui.handlers.domain;
-using desktop.ui.handlers.orm;
-using desktop.ui.messages.@private;
-using desktop.ui.presenters;
+using solidware.financials.infrastructure;
+using solidware.financials.messages;
+using solidware.financials.service.domain;
+using solidware.financials.service.orm;
 
-namespace desktop.ui.handlers
+namespace solidware.financials.service.handlers
 {
     public class AddNewFamilyMemberHandler : Handles<FamilyMemberToAdd>
     {

@@ -1,9 +1,10 @@
-using desktop.ui.handlers.domain;
-using desktop.ui.handlers.orm;
-using desktop.ui.presenters;
-using gorilla.utility;
+using gorilla.utility;
+using solidware.financials.infrastructure;
+using solidware.financials.messages;
+using solidware.financials.service.domain;
+using solidware.financials.service.orm;
 
-namespace desktop.ui.handlers
+namespace solidware.financials.service.handlers
 {
     public class FindAllFamilyHandler : Handles<FindAllFamily>
     {

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using desktop.ui.handlers.domain;
 using gorilla.utility;
 using System.Linq;
+using solidware.financials.service.domain;
 
-namespace desktop.ui.handlers.orm
+namespace solidware.financials.service.orm
 {
     public class InMemoryDatabase : PersonRepository
     {

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using desktop.ui.handlers.domain;
+using solidware.financials.service.domain;
 
-namespace desktop.ui.handlers.orm
+namespace solidware.financials.service.orm
 {
     public interface PersonRepository
     {

@@ -8,8 +8,8 @@
     <ProjectGuid>{9928913D-5BCE-422F-9A12-13A10ACE836D}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>service</RootNamespace>
-    <AssemblyName>service</AssemblyName>
+    <RootNamespace>solidware.financials.service</RootNamespace>
+    <AssemblyName>solidware.financials.service</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -45,11 +45,11 @@
   <ItemGroup>
     <Compile Include="handlers\AddIncomeCommandMessageHandler.cs" />
     <Compile Include="handlers\AddNewFamilyMemberHandler.cs" />
-    <Compile Include="handlers\domain\Entity.cs" />
-    <Compile Include="handlers\domain\Person.cs" />
+    <Compile Include="domain\Entity.cs" />
+    <Compile Include="domain\Person.cs" />
     <Compile Include="handlers\FindAllFamilyHandler.cs" />
-    <Compile Include="handlers\orm\InMemoryDatabase.cs" />
-    <Compile Include="handlers\orm\PersonRepository.cs" />
+    <Compile Include="orm\InMemoryDatabase.cs" />
+    <Compile Include="orm\PersonRepository.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

@@ -55,9 +55,9 @@
     <Compile Include="Create.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\desktop.ui\desktop.ui.csproj">
+    <ProjectReference Include="..\desktop.ui\solidware.financials.csproj">
       <Project>{1E07A7D1-661C-48A2-B67B-180C6107CC92}</Project>
-      <Name>desktop.ui</Name>
+      <Name>solidware.financials</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

@@ -33,7 +33,7 @@
   </target>
 
   <target name="_publish.installer" depends="compile">
-    <property name="project.file" value="${base.dir}\product\desktop.ui\desktop.ui.csproj" />
+    <property name="project.file" value="${base.dir}\product\desktop.ui\solidware.financials.csproj" />
     <property name="support.url" value="http://solidware.ca/" />
     <property name="command.line" value='${project.file} /t:publish /m /p:UpdateEnabled=true /p:UpdateRequired=true /p:MinimumRequiredVersion=${version.number} /p:PublisherName="${publisher.name}" /p:ProductName="${product.name}" /p:PublishUrl=${publish.url} /p:InstallUrl=${publish.url} /p:UpdateUrl=${update.url} /p:Install=True /p:ApplicationVersion=${major}.${minor}.${build}.* /p:ApplicationRevision=${revision} /p:UpdateInterval=1 /p:UpdateIntervalUnits=Minutes /p:UpdateUrlEnabled=True /p:IsWebBootstrapper=True /p:InstallFrom=Web /p:PublishDir=${publish.dir} /p:ManifestKeyFile="${key.file}" /p:ManifestCertificateThumbprint="${key.file.thumbprint}" /p:SupportUrl=${support.url}' />
     <exec program="${msbuild.exe}" commandline="${command.line}" />

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "desktop.ui", "product\desktop.ui\desktop.ui.csproj", "{1E07A7D1-661C-48A2-B67B-180C6107CC92}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "solidware.financials", "product\desktop.ui\solidware.financials.csproj", "{1E07A7D1-661C-48A2-B67B-180C6107CC92}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "specs", "product\specs\specs.csproj", "{B10E4560-2546-4A11-B2D1-5505BFCDDCC9}"
 EndProject