tidy up the folder structure

13 files changed, 22 insertions, 18 deletions

diff --git a/src/core/RoboMom.cs b/src/core/RoboMom.cs
index 6a23a7d..69be84a 100755
--- a/src/core/RoboMom.cs
+++ b/src/core/RoboMom.cs
@@ -1,4 +1,5 @@
 using Robocode;

+using core.infrastructure;

 

 namespace core

 {

diff --git a/src/core/core.csproj b/src/core/core.csproj
index 2f4d1cf..fed2bf2 100755
--- a/src/core/core.csproj
+++ b/src/core/core.csproj
@@ -43,16 +43,16 @@
     <Reference Include="System.Xml" />

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="Casting.cs" />

-    <Compile Include="Dynamic.cs" />

-    <Compile Include="IEventAggregator.cs" />

-    <Compile Include="IEventRegistry.cs" />

-    <Compile Include="IPublishEvents.cs" />

-    <Compile Include="ISubscribeTo.cs" />

-    <Compile Include="Iterating.cs" />

+    <Compile Include="extensions\Casting.cs" />

+    <Compile Include="extensions\Dynamic.cs" />

+    <Compile Include="infrastructure\IEventAggregator.cs" />

+    <Compile Include="infrastructure\IEventRegistry.cs" />

+    <Compile Include="infrastructure\IPublishEvents.cs" />

+    <Compile Include="infrastructure\ISubscribeTo.cs" />

+    <Compile Include="extensions\Iterating.cs" />

     <Compile Include="RoboMom.cs" />

     <Compile Include="Properties\AssemblyInfo.cs" />

-    <Compile Include="ThreadUnsafeEventAggregator.cs" />

+    <Compile Include="infrastructure\ThreadUnsafeEventAggregator.cs" />

   </ItemGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/src/core/Casting.cs b/src/core/extensions/Casting.cs
index dbc25f0..24c12a6 100755
--- a/src/core/Casting.cs
+++ b/src/core/extensions/Casting.cs
@@ -1,4 +1,4 @@
-namespace core

+namespace core.extensions

 {

     public static class Casting

     {

diff --git a/src/core/Dynamic.cs b/src/core/extensions/Dynamic.cs
index ae4a627..fa25f59 100755
--- a/src/core/Dynamic.cs
+++ b/src/core/extensions/Dynamic.cs
@@ -1,6 +1,6 @@
 using System;

 

-namespace core

+namespace core.extensions

 {

     public static class Dynamic

     {

diff --git a/src/core/Iterating.cs b/src/core/extensions/Iterating.cs
index 3e7de14..a1cb116 100755
--- a/src/core/Iterating.cs
+++ b/src/core/extensions/Iterating.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;

 using System.Linq;

 

-namespace core

+namespace core.extensions

 {

     public static class Iterating

     {

diff --git a/src/core/IEventAggregator.cs b/src/core/infrastructure/IEventAggregator.cs
index 91758f7..94c174d 100755
--- a/src/core/IEventAggregator.cs
+++ b/src/core/infrastructure/IEventAggregator.cs
@@ -1,4 +1,4 @@
-namespace core

+namespace core.infrastructure

 {

     public interface IEventAggregator : IEventRegistry, IPublishEvents {}

 }
\ No newline at end of file
diff --git a/src/core/IEventRegistry.cs b/src/core/infrastructure/IEventRegistry.cs
index db9c475..3e17ef5 100755
--- a/src/core/IEventRegistry.cs
+++ b/src/core/infrastructure/IEventRegistry.cs
@@ -1,4 +1,4 @@
-namespace core

+namespace core.infrastructure

 {

     public interface IEventRegistry

     {

diff --git a/src/core/IPublishEvents.cs b/src/core/infrastructure/IPublishEvents.cs
index af540c3..10b3a84 100755
--- a/src/core/IPublishEvents.cs
+++ b/src/core/infrastructure/IPublishEvents.cs
@@ -1,4 +1,4 @@
-namespace core

+namespace core.infrastructure

 {

     public interface IPublishEvents

     {

diff --git a/src/core/ISubscribeTo.cs b/src/core/infrastructure/ISubscribeTo.cs
index b2fd12e..eb94f37 100755
--- a/src/core/ISubscribeTo.cs
+++ b/src/core/infrastructure/ISubscribeTo.cs
@@ -1,4 +1,4 @@
-namespace core

+namespace core.infrastructure

 {

     public interface ISubscribeTo<Event>

     {

diff --git a/src/core/ThreadUnsafeEventAggregator.cs b/src/core/infrastructure/ThreadUnsafeEventAggregator.cs
index c0d902f..3c276e8 100755
--- a/src/core/ThreadUnsafeEventAggregator.cs
+++ b/src/core/infrastructure/ThreadUnsafeEventAggregator.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;

+using core.extensions;

 

-namespace core

+namespace core.infrastructure

 {

     public class ThreadUnsafeEventAggregator : IEventAggregator

     {

diff --git a/src/specs/RoboMomSpecs.cs b/src/specs/RoboMomSpecs.cs
index 0869299..2fe51b9 100755
--- a/src/specs/RoboMomSpecs.cs
+++ b/src/specs/RoboMomSpecs.cs
@@ -2,6 +2,7 @@
 using Rhino.Mocks;

 using Robocode;

 using core;

+using core.infrastructure;

 

 namespace specs

 {

diff --git a/src/specs/EventAggregatorSpec.cs b/src/specs/infrastructure/EventAggregatorSpec.cs
index b30cffc..4c75869 100755
--- a/src/specs/EventAggregatorSpec.cs
+++ b/src/specs/infrastructure/EventAggregatorSpec.cs
@@ -1,8 +1,9 @@
 using Machine.Specifications;

 using Rhino.Mocks;

 using core;

+using core.infrastructure;

 

-namespace specs

+namespace specs.infrastructure

 {

     public class EventAggregatorSpec

     {

diff --git a/src/specs/specs.csproj b/src/specs/specs.csproj
index c1a7786..bff6138 100755
--- a/src/specs/specs.csproj
+++ b/src/specs/specs.csproj
@@ -52,7 +52,7 @@
     <Reference Include="System.Xml" />

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="EventAggregatorSpec.cs" />

+    <Compile Include="infrastructure\EventAggregatorSpec.cs" />

     <Compile Include="Mock.cs" />

     <Compile Include="RoboMomSpecs.cs" />

     <Compile Include="Properties\AssemblyInfo.cs" />