diff --git a/Scrummer/Code/Controls/CButton.cs b/Scrummer/Code/Controls/CButton.cs
deleted file mode 100644
index 8abee23..0000000
--- a/Scrummer/Code/Controls/CButton.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI.WebControls;
-
-namespace Scrummer.Code.Controls
-{
-    public class CButton : Button
-    {
-        public CButton()
-        {
-            CssClass = "button";
-        }
-    }
-}
\ No newline at end of file
diff --git a/Scrummer/Code/Controls/IValidableControl.cs b/Scrummer/Code/Controls/IValidableControl.cs
deleted file mode 100644
index a5b87db..0000000
--- a/Scrummer/Code/Controls/IValidableControl.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Scrummer.Code.Controls
-{
-    public interface IValidableControl
-    {
-        bool IsValid();
-    }
-}
diff --git a/Scrummer/Code/GlobalErrorHandler.cs b/Scrummer/Code/GlobalErrorHandler.cs
index 3aba2ac..177ce34 100644
--- a/Scrummer/Code/GlobalErrorHandler.cs
+++ b/Scrummer/Code/GlobalErrorHandler.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 using System.Web;
-using Scrummer.Code.Pages;
+using Scrummer.Pages;
 
 namespace Scrummer.Code
 {
diff --git a/Scrummer/Controls/CButton.cs b/Scrummer/Controls/CButton.cs
new file mode 100644
index 0000000..feb76f6
--- /dev/null
+++ b/Scrummer/Controls/CButton.cs
@@ -0,0 +1,12 @@
+using System.Web.UI.WebControls;
+
+namespace Scrummer.Controls
+{
+    public class CButton : Button
+    {
+        public CButton()
+        {
+            CssClass = "button";
+        }
+    }
+}
\ No newline at end of file
diff --git a/Scrummer/Code/Controls/CLabel.cs b/Scrummer/Controls/CLabel.cs
similarity index 91%
rename from Scrummer/Code/Controls/CLabel.cs
rename to Scrummer/Controls/CLabel.cs
index 41b28d3..fabf7fe 100644
--- a/Scrummer/Code/Controls/CLabel.cs
+++ b/Scrummer/Controls/CLabel.cs
@@ -1,7 +1,7 @@
 using System.Web.UI;
 using System.Web.UI.WebControls;
 
-namespace Scrummer.Code.Controls
+namespace Scrummer.Controls
 {
     public class CLabel : Label
     {
diff --git a/Scrummer/Code/Controls/CTextbox.cs b/Scrummer/Controls/CTextBox.cs
similarity index 91%
rename from Scrummer/Code/Controls/CTextbox.cs
rename to Scrummer/Controls/CTextBox.cs
index 492455f..eb2b078 100644
--- a/Scrummer/Code/Controls/CTextbox.cs
+++ b/Scrummer/Controls/CTextBox.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 
-namespace Scrummer.Code.Controls
+namespace Scrummer.Controls
 {
     public class CTextBox : TextBox, IValidableControl
     {
diff --git a/Scrummer/Code/Controls/ChatControl.cs b/Scrummer/Controls/ChatControl.cs
similarity index 96%
rename from Scrummer/Code/Controls/ChatControl.cs
rename to Scrummer/Controls/ChatControl.cs
index fb7c9f8..0084441 100644
--- a/Scrummer/Code/Controls/ChatControl.cs
+++ b/Scrummer/Controls/ChatControl.cs
@@ -3,7 +3,7 @@ using System.Text;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 
-namespace Scrummer.Code.Controls
+namespace Scrummer.Controls
 {
     public class ChatControl : Control, INamingContainer
     {
diff --git a/Scrummer/Code/Controls/ChatHandler.cs b/Scrummer/Controls/ChatHandler.cs
similarity index 96%
rename from Scrummer/Code/Controls/ChatHandler.cs
rename to Scrummer/Controls/ChatHandler.cs
index c1d0ae7..78d4d56 100644
--- a/Scrummer/Code/Controls/ChatHandler.cs
+++ b/Scrummer/Controls/ChatHandler.cs
@@ -6,7 +6,7 @@ using Scrummer.Code.BusinessLogic;
 using Scrummer.Code.Entities;
 using Scrummer.Code.JSON;
 
-namespace Scrummer.Code
+namespace Scrummer.Controls
 {
     public class ChatHandler : IHttpHandler
     {
diff --git a/Scrummer/Controls/IValidableControl.cs b/Scrummer/Controls/IValidableControl.cs
new file mode 100644
index 0000000..3232a3a
--- /dev/null
+++ b/Scrummer/Controls/IValidableControl.cs
@@ -0,0 +1,8 @@
+
+namespace Scrummer.Controls
+{
+    public interface IValidableControl
+    {
+        bool IsValid();
+    }
+}
diff --git a/Scrummer/Code/Pages/FormUtils.cs b/Scrummer/Pages/FormUtils.cs
similarity index 88%
rename from Scrummer/Code/Pages/FormUtils.cs
rename to Scrummer/Pages/FormUtils.cs
index 777d39c..81d4bd9 100644
--- a/Scrummer/Code/Pages/FormUtils.cs
+++ b/Scrummer/Pages/FormUtils.cs
@@ -1,12 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
+using System.Web.UI;
 using System.Web.UI.WebControls;
-using Scrummer.Code.Controls;
+using Scrummer.Controls;
 
-namespace Scrummer.Code.Pages
+namespace Scrummer.Pages
 {
     public class FormUtils
     {
diff --git a/Scrummer/Code/Pages/FrmBoard.cs b/Scrummer/Pages/FrmBoard.cs
similarity index 87%
rename from Scrummer/Code/Pages/FrmBoard.cs
rename to Scrummer/Pages/FrmBoard.cs
index 74feadd..62c9979 100644
--- a/Scrummer/Code/Pages/FrmBoard.cs
+++ b/Scrummer/Pages/FrmBoard.cs
@@ -1,7 +1,7 @@
 using System;
-using Scrummer.Code.Controls;
+using Scrummer.Controls;
 
-namespace Scrummer.Code.Pages
+namespace Scrummer.Pages
 {
     public class FrmBoard : PageCommon
     {
diff --git a/Scrummer/Code/Pages/FrmEcho.cs b/Scrummer/Pages/FrmEcho.cs
similarity index 90%
rename from Scrummer/Code/Pages/FrmEcho.cs
rename to Scrummer/Pages/FrmEcho.cs
index 3eccb18..3c55c31 100644
--- a/Scrummer/Code/Pages/FrmEcho.cs
+++ b/Scrummer/Pages/FrmEcho.cs
@@ -1,7 +1,7 @@
 using System.Web;
 using Scrummer.Code.JSON;
 
-namespace Scrummer.Code.Pages
+namespace Scrummer.Pages
 {
     public class FrmEcho : IHttpHandler
     {
diff --git a/Scrummer/Code/Pages/FrmError.cs b/Scrummer/Pages/FrmError.cs
similarity index 93%
rename from Scrummer/Code/Pages/FrmError.cs
rename to Scrummer/Pages/FrmError.cs
index dfb4248..bab7d37 100644
--- a/Scrummer/Code/Pages/FrmError.cs
+++ b/Scrummer/Pages/FrmError.cs
@@ -2,9 +2,9 @@
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
-using Scrummer.Code.Controls;
+using Scrummer.Controls;
 
-namespace Scrummer.Code.Pages
+namespace Scrummer.Pages
 {
     public class FrmError : PageCommon
     {
diff --git a/Scrummer/Code/Pages/FrmLogin.cs b/Scrummer/Pages/FrmLogin.cs
similarity index 94%
rename from Scrummer/Code/Pages/FrmLogin.cs
rename to Scrummer/Pages/FrmLogin.cs
index 273af22..d8ac9d7 100644
--- a/Scrummer/Code/Pages/FrmLogin.cs
+++ b/Scrummer/Pages/FrmLogin.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Web.UI.WebControls;
 using Scrummer.Code.BusinessLogic;
-using Scrummer.Code.Controls;
+using Scrummer.Controls;
 
-namespace Scrummer.Code.Pages
+namespace Scrummer.Pages
 {
     public class FrmLogin : PageCommon
     {
diff --git a/Scrummer/Code/Pages/FrmRegister.cs b/Scrummer/Pages/FrmRegister.cs
similarity index 96%
rename from Scrummer/Code/Pages/FrmRegister.cs
rename to Scrummer/Pages/FrmRegister.cs
index 166da7c..b01c5b6 100644
--- a/Scrummer/Code/Pages/FrmRegister.cs
+++ b/Scrummer/Pages/FrmRegister.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Web.UI.WebControls;
 using Scrummer.Code.BusinessLogic;
-using Scrummer.Code.Controls;
 using Scrummer.Code.Entities;
+using Scrummer.Controls;
 
-namespace Scrummer.Code.Pages
+namespace Scrummer.Pages
 {
     public class FrmRegister : PageCommon
     {
diff --git a/Scrummer/Code/Pages/PageCommon.cs b/Scrummer/Pages/PageCommon.cs
similarity index 95%
rename from Scrummer/Code/Pages/PageCommon.cs
rename to Scrummer/Pages/PageCommon.cs
index 3d36b28..be2bb82 100644
--- a/Scrummer/Code/Pages/PageCommon.cs
+++ b/Scrummer/Pages/PageCommon.cs
@@ -5,10 +5,10 @@ using System.Web.UI;
 using System.Web.UI.HtmlControls;
 using System.Web.UI.WebControls;
 using Scrummer.Code.BusinessLogic;
-using Scrummer.Code.Controls;
 using Scrummer.Code.Entities;
+using Scrummer.Controls;
 
-namespace Scrummer.Code.Pages
+namespace Scrummer.Pages
 {
     public class PageCommon : Page
     {
diff --git a/Scrummer/Scrummer.csproj b/Scrummer/Scrummer.csproj
index 2fa19f2..e69d863 100644
--- a/Scrummer/Scrummer.csproj
+++ b/Scrummer/Scrummer.csproj
@@ -70,12 +70,12 @@
     <Compile Include="Code\BusinessLogic\Persistence.cs" />
     <Compile Include="Code\BusinessLogic\Sessions.cs" />
     <Compile Include="Code\BusinessLogic\Users.cs" />
-    <Compile Include="Code\Controls\CButton.cs" />
-    <Compile Include="Code\Controls\ChatControl.cs" />
-    <Compile Include="Code\Controls\ChatHandler.cs" />
-    <Compile Include="Code\Controls\CLabel.cs" />
-    <Compile Include="Code\Controls\CTextBox.cs" />
-    <Compile Include="Code\Controls\IValidableControl.cs" />
+    <Compile Include="Controls\CButton.cs" />
+    <Compile Include="Controls\ChatControl.cs" />
+    <Compile Include="Controls\ChatHandler.cs" />
+    <Compile Include="Controls\CLabel.cs" />
+    <Compile Include="Controls\CTextBox.cs" />
+    <Compile Include="Controls\IValidableControl.cs" />
     <Compile Include="Code\CryptoUtils.cs" />
     <Compile Include="Code\Entities\Message.cs" />
     <Compile Include="Code\Entities\OperationStatus.cs" />
@@ -83,18 +83,18 @@
     <Compile Include="Code\Entities\User.cs" />
     <Compile Include="Code\GlobalErrorHandler.cs" />
     <Compile Include="Code\JSON\ParserContext.cs" />
-    <Compile Include="Code\Pages\FormUtils.cs" />
-    <Compile Include="Code\Pages\FrmBoard.cs">
+    <Compile Include="Pages\FormUtils.cs" />
+    <Compile Include="Pages\FrmBoard.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="Code\Pages\FrmEcho.cs" />
-    <Compile Include="Code\Pages\FrmLogin.cs">
+    <Compile Include="Pages\FrmEcho.cs" />
+    <Compile Include="Pages\FrmLogin.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="Code\Pages\FrmRegister.cs">
+    <Compile Include="Pages\FrmRegister.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="Code\Pages\PageCommon.cs">
+    <Compile Include="Pages\PageCommon.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Code\ScriptsBundler.cs" />
@@ -102,7 +102,7 @@
     <Compile Include="GlobalRouter.cs" />
     <Compile Include="Code\JSON\JSONParser.cs" />
     <Compile Include="Code\JSON\JSONWriter.cs" />
-    <Compile Include="Code\Pages\FrmError.cs">
+    <Compile Include="Pages\FrmError.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Globals.cs" />