diff --git a/MonoStockPortfolio/AddPositionActivity.cs b/MonoStockPortfolio/Activites/AddPositionActivity.cs
similarity index 93%
rename from MonoStockPortfolio/AddPositionActivity.cs
rename to MonoStockPortfolio/Activites/AddPositionActivity.cs
index 8a33d53..3418042 100644
--- a/MonoStockPortfolio/AddPositionActivity.cs
+++ b/MonoStockPortfolio/Activites/AddPositionActivity.cs
@@ -5,9 +5,9 @@ using Android.OS;
 using Android.Widget;
 using MonoStockPortfolio.Core.PortfolioRepositories;
 using MonoStockPortfolio.Entities;
-using MonoStockPortfolio.Validation;
+using MonoStockPortfolio.Framework;
 
-namespace MonoStockPortfolio
+namespace MonoStockPortfolio.Activites
 {
     [Activity(Label = "Add Position", MainLauncher = false)]
     public partial class AddPositionActivity : Activity
diff --git a/MonoStockPortfolio/AddPositionActivity.designer.cs b/MonoStockPortfolio/Activites/AddPositionActivity.designer.cs
similarity index 87%
rename from MonoStockPortfolio/AddPositionActivity.designer.cs
rename to MonoStockPortfolio/Activites/AddPositionActivity.designer.cs
index 28a0b1f..899f3e1 100644
--- a/MonoStockPortfolio/AddPositionActivity.designer.cs
+++ b/MonoStockPortfolio/Activites/AddPositionActivity.designer.cs
@@ -1,10 +1,10 @@
 using Android.Widget;
 
-namespace MonoStockPortfolio
+namespace MonoStockPortfolio.Activites
 {
     public partial class AddPositionActivity
     {
-        public static string ClassName { get { return "monostockportfolio.AddPositionActivity"; } }
+        public static string ClassName { get { return "monostockportfolio.activites.AddPositionActivity"; } }
         public static string Extra_PortfolioID { get { return "monoStockPortfolio.AddPositionActivity.PortfolioID"; } }
 
         protected EditText TickerTextBox { get { return FindViewById<EditText>(Resource.id.addPositionTicker); } }
diff --git a/MonoStockPortfolio/EditPortfolioActivity.cs b/MonoStockPortfolio/Activites/EditPortfolioActivity.cs
similarity index 94%
rename from MonoStockPortfolio/EditPortfolioActivity.cs
rename to MonoStockPortfolio/Activites/EditPortfolioActivity.cs
index 4df2ba2..85dc49d 100644
--- a/MonoStockPortfolio/EditPortfolioActivity.cs
+++ b/MonoStockPortfolio/Activites/EditPortfolioActivity.cs
@@ -5,9 +5,9 @@ using Android.OS;
 using Android.Widget;
 using MonoStockPortfolio.Core.PortfolioRepositories;
 using MonoStockPortfolio.Entities;
-using MonoStockPortfolio.Validation;
+using MonoStockPortfolio.Framework;
 
-namespace MonoStockPortfolio
+namespace MonoStockPortfolio.Activites
 {
     [Activity(Label = "Add Portfolio", MainLauncher = false)]
     public partial class EditPortfolioActivity : Activity
diff --git a/MonoStockPortfolio/EditPortfolioActivity.designer.cs b/MonoStockPortfolio/Activites/EditPortfolioActivity.designer.cs
similarity index 82%
rename from MonoStockPortfolio/EditPortfolioActivity.designer.cs
rename to MonoStockPortfolio/Activites/EditPortfolioActivity.designer.cs
index 76ece6a..aba69b6 100644
--- a/MonoStockPortfolio/EditPortfolioActivity.designer.cs
+++ b/MonoStockPortfolio/Activites/EditPortfolioActivity.designer.cs
@@ -1,10 +1,10 @@
 using Android.Widget;
 
-namespace MonoStockPortfolio
+namespace MonoStockPortfolio.Activites
 {
     public partial class EditPortfolioActivity
     {
-        public static string ClassName { get { return "monostockportfolio.EditPortfolioActivity"; } }
+        public static string ClassName { get { return "monostockportfolio.activites.EditPortfolioActivity"; } }
         public static string Extra_PortfolioID { get { return "monoStockPortfolio.EditPortfolioActivity.PortfolioID"; } }
 
         protected Button SaveButton { get { return FindViewById<Button>(Resource.id.btnSave); } }
diff --git a/MonoStockPortfolio/MainActivity.cs b/MonoStockPortfolio/Activites/MainActivity.cs
similarity index 95%
rename from MonoStockPortfolio/MainActivity.cs
rename to MonoStockPortfolio/Activites/MainActivity.cs
index eacbfb4..59c310a 100644
--- a/MonoStockPortfolio/MainActivity.cs
+++ b/MonoStockPortfolio/Activites/MainActivity.cs
@@ -8,8 +8,9 @@ using Android.Widget;
 using MonoStockPortfolio.Core.PortfolioRepositories;
 using MonoStockPortfolio.Core.Services;
 using MonoStockPortfolio.Entities;
+using MonoStockPortfolio.Framework;
 
-namespace MonoStockPortfolio
+namespace MonoStockPortfolio.Activites
 {
     [Activity(Label = "Stock Portfolio", MainLauncher = true, Icon = "@drawable/icon")]
     public partial class MainActivity : Activity
diff --git a/MonoStockPortfolio/MainActivity.designer.cs b/MonoStockPortfolio/Activites/MainActivity.designer.cs
similarity index 80%
rename from MonoStockPortfolio/MainActivity.designer.cs
rename to MonoStockPortfolio/Activites/MainActivity.designer.cs
index ea1aa9d..6da565b 100644
--- a/MonoStockPortfolio/MainActivity.designer.cs
+++ b/MonoStockPortfolio/Activites/MainActivity.designer.cs
@@ -1,10 +1,10 @@
 using Android.Widget;
 
-namespace MonoStockPortfolio
+namespace MonoStockPortfolio.Activites
 {
     public partial class MainActivity
     {
-        public static string ClassName { get { return "monostockportfolio.MainActivity"; } }
+        public static string ClassName { get { return "monostockportfolio.activites.MainActivity"; } }
 
         protected Button AddPortfolioButton { get { return FindViewById<Button>(Resource.id.btnAddPortfolio); } }
         protected ListView PortfolioListView { get { return FindViewById<ListView>(Resource.id.portfolioList); } }
diff --git a/MonoStockPortfolio/PortfolioActivity.cs b/MonoStockPortfolio/Activites/PortfolioActivity.cs
similarity index 96%
rename from MonoStockPortfolio/PortfolioActivity.cs
rename to MonoStockPortfolio/Activites/PortfolioActivity.cs
index a74f1f4..c54a040 100644
--- a/MonoStockPortfolio/PortfolioActivity.cs
+++ b/MonoStockPortfolio/Activites/PortfolioActivity.cs
@@ -10,8 +10,9 @@ using Android.Views;
 using Android.Widget;
 using MonoStockPortfolio.Core;
 using MonoStockPortfolio.Core.Services;
+using MonoStockPortfolio.Framework;
 
-namespace MonoStockPortfolio
+namespace MonoStockPortfolio.Activites
 {
     [Activity(Label = "Portfolio")]
     public partial class PortfolioActivity : Activity
diff --git a/MonoStockPortfolio/PortfolioActivity.designer.cs b/MonoStockPortfolio/Activites/PortfolioActivity.designer.cs
similarity index 85%
rename from MonoStockPortfolio/PortfolioActivity.designer.cs
rename to MonoStockPortfolio/Activites/PortfolioActivity.designer.cs
index 2f7c3fe..b173147 100644
--- a/MonoStockPortfolio/PortfolioActivity.designer.cs
+++ b/MonoStockPortfolio/Activites/PortfolioActivity.designer.cs
@@ -1,10 +1,10 @@
 using Android.Widget;
 
-namespace MonoStockPortfolio
+namespace MonoStockPortfolio.Activites
 {
     public partial class PortfolioActivity
     {
-        public static string ClassName { get { return "monostockportfolio.PortfolioActivity"; } }
+        public static string ClassName { get { return "monostockportfolio.activites.PortfolioActivity"; } }
 
         public static string Extra_PortfolioID { get { return "monoStockPortfolio.PortfolioActivity.PortfolioID"; } }
         public long ThisPortofolioId { get { return Intent.GetLongExtra(Extra_PortfolioID, -1); } }
diff --git a/MonoStockPortfolio/Validation/FormValidator.cs b/MonoStockPortfolio/Framework/FormValidator.cs
similarity index 95%
rename from MonoStockPortfolio/Validation/FormValidator.cs
rename to MonoStockPortfolio/Framework/FormValidator.cs
index 3ac2197..a345807 100644
--- a/MonoStockPortfolio/Validation/FormValidator.cs
+++ b/MonoStockPortfolio/Framework/FormValidator.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using Android.Widget;
 
-namespace MonoStockPortfolio.Validation
+namespace MonoStockPortfolio.Framework
 {
     public class FormValidator
     {
diff --git a/MonoStockPortfolio/IoCAttribute.cs b/MonoStockPortfolio/Framework/IoCAttribute.cs
similarity index 95%
rename from MonoStockPortfolio/IoCAttribute.cs
rename to MonoStockPortfolio/Framework/IoCAttribute.cs
index 04959f7..efb1cff 100644
--- a/MonoStockPortfolio/IoCAttribute.cs
+++ b/MonoStockPortfolio/Framework/IoCAttribute.cs
@@ -5,7 +5,7 @@ using MonoStockPortfolio.Core.PortfolioRepositories;
 using MonoStockPortfolio.Core.Services;
 using PostSharp.Aspects;
 
-namespace MonoStockPortfolio
+namespace MonoStockPortfolio.Framework
 {
     public class IoCAttribute : LocationInterceptionAspect
     {
diff --git a/MonoStockPortfolio/StringExtensions.cs b/MonoStockPortfolio/Framework/StringExtensions.cs
similarity index 86%
rename from MonoStockPortfolio/StringExtensions.cs
rename to MonoStockPortfolio/Framework/StringExtensions.cs
index f7d63a6..ff36e89 100644
--- a/MonoStockPortfolio/StringExtensions.cs
+++ b/MonoStockPortfolio/Framework/StringExtensions.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace MonoStockPortfolio
+namespace MonoStockPortfolio.Framework
 {
     public static class StringExtensions
     {
diff --git a/MonoStockPortfolio/MonoStockPortfolio.csproj b/MonoStockPortfolio/MonoStockPortfolio.csproj
index fcf2a46..d56e53b 100644
--- a/MonoStockPortfolio/MonoStockPortfolio.csproj
+++ b/MonoStockPortfolio/MonoStockPortfolio.csproj
@@ -48,27 +48,27 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AddPositionActivity.designer.cs">
+    <Compile Include="Activites\AddPositionActivity.designer.cs">
       <DependentUpon>AddPositionActivity.cs</DependentUpon>
     </Compile>
-    <Compile Include="EditPortfolioActivity.cs" />
-    <Compile Include="EditPortfolioActivity.designer.cs">
+    <Compile Include="Activites\EditPortfolioActivity.cs" />
+    <Compile Include="Activites\EditPortfolioActivity.designer.cs">
       <DependentUpon>EditPortfolioActivity.cs</DependentUpon>
     </Compile>
-    <Compile Include="IoCAttribute.cs" />
-    <Compile Include="MainActivity.designer.cs">
+    <Compile Include="Framework\IoCAttribute.cs" />
+    <Compile Include="Activites\MainActivity.designer.cs">
       <DependentUpon>MainActivity.cs</DependentUpon>
     </Compile>
-    <Compile Include="PortfolioActivity.cs" />
-    <Compile Include="MainActivity.cs" />
-    <Compile Include="AddPositionActivity.cs" />
-    <Compile Include="PortfolioActivity.designer.cs">
+    <Compile Include="Activites\PortfolioActivity.cs" />
+    <Compile Include="Activites\MainActivity.cs" />
+    <Compile Include="Activites\AddPositionActivity.cs" />
+    <Compile Include="Activites\PortfolioActivity.designer.cs">
       <DependentUpon>PortfolioActivity.cs</DependentUpon>
     </Compile>
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="StringExtensions.cs" />
-    <Compile Include="Validation\FormValidator.cs" />
+    <Compile Include="Framework\StringExtensions.cs" />
+    <Compile Include="Framework\FormValidator.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="PostSharp.Custom.targets">