diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 27c0759..007f860 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,29 +7,22 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="eb36c2e9-c6c6-48da-b007-cd41eccd9e5a" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/BeginMatch.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/JoinMatch.java" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/client_1.log" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/notificationServer.log" afterPath="" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/AccountsService.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/managers/AccountsManager.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/SessionsService.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/managers/SessionsManager.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/JoinTimeout.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/TimeoutJoin.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/MatchTimeout.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/TimeoutMatch.java" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/managers/AccountsManager.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/models/Accounts.java" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/managers/SessionsManager.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/models/Sessions.java" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/proxies/MessageDispatcher.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/dispatchers/MessageDispatcher.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/controllers/MatchRequestController.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/controllers/MatchRequestController.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/controllers/MatchSetupController.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/controllers/MatchSetupController.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetupPage.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetupPage.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/services/GameService.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/services/GameService.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/services/NotificationClientService.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/services/NotificationClientService.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/WaitForPlayers.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/WaitForPlayers.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Commons/src/interfaces/INotificationServer.java" afterPath="$PROJECT_DIR$/Commons/src/interfaces/INotificationServer.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/models/Match.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/models/Match.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/proxies/MessageDispatcher.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/proxies/MessageDispatcher.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/App.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/App.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/services/AuthService.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/services/AuthService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Commons/src/constants/Config.java" afterPath="$PROJECT_DIR$/Commons/src/constants/Config.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/AuthService.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/AuthService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/MessageService.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/MessageService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/NotificationService.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/NotificationService.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/ReceiveWordsService.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/ReceiveWordsService.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/CheckOnlineUsers.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/CheckOnlineUsers.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/ComputeHighscores.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/ComputeHighscores.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/ComputeScore.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/ComputeScore.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/SendScores.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/SendScores.java" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -51,118 +44,117 @@
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="WaitForPlayers.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/WaitForPlayers.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1102">
-              <caret line="81" column="0" lean-forward="false" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="GameController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/controllers/GameController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="283">
-              <caret line="26" column="19" lean-forward="false" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="19" />
-              <folding>
-                <element signature="e#936#937#0" expanded="true" />
-                <element signature="e#987#988#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="WaitForScore.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/WaitForScore.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="52">
-              <caret line="27" column="25" lean-forward="true" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="25" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="FetchHighscore.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/FetchHighscore.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="283">
-              <caret line="37" column="42" lean-forward="false" selection-start-line="37" selection-start-column="42" selection-end-line="37" selection-end-column="42" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="BeginMatch.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/BeginMatch.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="178">
-              <caret line="25" column="37" lean-forward="true" selection-start-line="25" selection-start-column="37" selection-end-line="25" selection-end-column="37" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="JoinMatch.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/JoinMatch.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="441">
-              <caret line="33" column="51" lean-forward="false" selection-start-line="33" selection-start-column="51" selection-end-line="33" selection-end-column="51" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#474#475#0" expanded="true" />
-                <element signature="e#516#517#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="NotificationClientService.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/services/NotificationClientService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
-              <caret line="21" column="20" lean-forward="false" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="MatchSetupController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/controllers/MatchSetupController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="231">
-              <caret line="14" column="47" lean-forward="true" selection-start-line="14" selection-start-column="47" selection-end-line="14" selection-end-column="47" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="HomeController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/controllers/HomeController.java">
+      <file leaf-file-name="Sessions.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/models/Sessions.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="294">
-              <caret line="21" column="28" lean-forward="false" selection-start-line="21" selection-start-column="28" selection-end-line="21" selection-end-column="28" />
+              <caret line="19" column="5" lean-forward="false" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="MatchRequestController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/controllers/MatchRequestController.java">
+      <file leaf-file-name="Accounts.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/models/Accounts.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="273">
-              <caret line="18" column="43" lean-forward="true" selection-start-line="18" selection-start-column="43" selection-end-line="18" selection-end-column="43" />
+            <state relative-caret-position="189">
+              <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Match.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/models/Match.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="147">
+              <caret line="36" column="38" lean-forward="true" selection-start-line="36" selection-start-column="38" selection-end-line="36" selection-end-column="38" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Dictionary.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/models/Dictionary.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="210">
+              <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="JedisService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/JedisService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="630">
+              <caret line="40" column="5" lean-forward="true" selection-start-line="40" selection-start-column="5" selection-end-line="40" selection-end-column="5" />
               <folding>
-                <element signature="e#438#439#0" expanded="true" />
+                <element signature="e#412#413#0" expanded="true" />
                 <element signature="e#488#489#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="AuthService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/AuthService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="525">
+              <caret line="38" column="27" lean-forward="false" selection-start-line="38" selection-start-column="27" selection-end-line="38" selection-end-column="27" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="MessageService.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/MessageService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1656">
+              <caret line="79" column="46" lean-forward="false" selection-start-line="79" selection-start-column="36" selection-end-line="79" selection-end-column="46" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="NotificationService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/NotificationService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="199">
+              <caret line="20" column="46" lean-forward="true" selection-start-line="20" selection-start-column="46" selection-end-line="20" selection-end-column="46" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ReceiveWordsService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/ReceiveWordsService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="735">
+              <caret line="44" column="36" lean-forward="false" selection-start-line="44" selection-start-column="36" selection-end-line="44" selection-end-column="36" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <marker date="1500125990386" expanded="true" signature="391:398" ph="/**...*/" />
+                <marker date="1500125990386" expanded="true" signature="1594:1741" ph="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Config.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Commons/src/constants/Config.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="399">
+              <caret line="19" column="43" lean-forward="false" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -174,9 +166,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>play</find>
-      <find>pla</find>
-      <find>play!</find>
       <find>MA</find>
       <find>MATCH</find>
       <find>MATCH_N</find>
@@ -204,6 +193,9 @@
       <find>newma</find>
       <find>newm</find>
       <find>addto</find>
+      <find>R</find>
+      <find>Response</find>
+      <find>messagedis</find>
     </findStrings>
     <dirStrings>
       <dir>C:\Users\loke\TextTwist\out\production</dir>
@@ -342,10 +334,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/Commons/src/constants/Palette.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTGameBox.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLetter.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/GamePage.java" />
         <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/Main.java" />
         <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/models/servers/ThreadProxy.java" />
         <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/SendScore.java" />
@@ -391,8 +379,12 @@
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/BeginMatch.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/JoinMatch.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/controllers/MatchSetupController.java" />
-        <option value="$PROJECT_DIR$/Commons/src/constants/Config.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/WaitForPlayers.java" />
+        <option value="$PROJECT_DIR$/Commons/src/constants/Config.java" />
+        <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/managers/Accounts.java" />
+        <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/models/Accounts.java" />
+        <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/models/Sessions.java" />
+        <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/dispatchers/MessageDispatcher.java" />
       </list>
     </option>
   </component>
@@ -447,6 +439,89 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope">
+        <subPane subId="Changed Files">
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Server">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Server">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="src">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="com/texttwist/server">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="tasks">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Server">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Server">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="src">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="com/texttwist/server">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="models">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Server">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Server">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="src">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="com/texttwist/server">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="components">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
@@ -558,32 +633,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="TextTwist" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Texttwist" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Server" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="server" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="proxies" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="TextTwist" />
@@ -632,7 +681,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="managers" />
+              <option name="myItemId" value="dispatchers" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -880,89 +929,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope">
-        <subPane subId="Changed Files">
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Server">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Server">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="src">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="com/texttwist/server">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="tasks">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Server">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Server">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="src">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="com/texttwist/server">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="models">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Server">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Server">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="src">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="com/texttwist/server">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="components">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -1496,11 +1462,13 @@
       <workItem from="1499949143188" duration="13169000" />
       <workItem from="1499981493583" duration="7914000" />
       <workItem from="1500035694861" duration="13413000" />
+      <workItem from="1500123856495" duration="2205000" />
+      <workItem from="1500128026940" duration="1305000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="463348000" />
+    <option name="totallyTimeSpent" value="466858000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
@@ -1516,14 +1484,13 @@
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39949432" sideWeight="0.5164706" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="WINDOWED" visible="false" show_stripe_button="true" weight="0.4215148" sideWeight="0.6982353" order="2" side_tool="false" content_ui="tabs" x="389" y="368" width="1072" height="313" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="WINDOWED" visible="true" show_stripe_button="true" weight="0.4215148" sideWeight="0.6982353" order="2" side_tool="false" content_ui="tabs" x="389" y="368" width="1072" height="313" />
       <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2171875" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32821077" sideWeight="0.49764705" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -1536,6 +1503,7 @@
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.328125" sideWeight="0.5" order="10" side_tool="true" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32821077" sideWeight="0.49764705" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1555,55 +1523,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/Commons/src/models/User.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="11" column="27" lean-forward="true" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Commons/src/utilities/Logger.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="419">
-          <caret line="33" column="43" lean-forward="false" selection-start-line="33" selection-start-column="43" selection-end-line="33" selection-end-column="43" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Commons/src/utilities/Parse.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/RegisterPage.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/TimeoutMatch.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="10" column="41" lean-forward="false" selection-start-line="10" selection-start-column="41" selection-end-line="10" selection-end-column="41" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="11" column="1" lean-forward="true" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ClientBootstrap.java" />
     <entry file="file://$PROJECT_DIR$/Commons/src/interfaces/IBootstrap.java" />
     <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/BootstrapService.java" />
@@ -1634,39 +1553,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/JedisService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="21" column="63" lean-forward="false" selection-start-line="21" selection-start-column="63" selection-end-line="21" selection-end-column="63" />
-          <folding>
-            <element signature="e#412#413#0" expanded="false" />
-            <element signature="e#488#489#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/MessageService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="903">
-          <caret line="56" column="20" lean-forward="false" selection-start-line="56" selection-start-column="20" selection-end-line="56" selection-end-column="20" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/ReceiveWordsService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="735">
-          <caret line="44" column="36" lean-forward="false" selection-start-line="44" selection-start-column="36" selection-end-line="44" selection-end-column="36" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <marker date="1500064501690" expanded="true" signature="400:407" ph="/**...*/" />
-            <marker date="1500064501690" expanded="true" signature="1607:1754" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/SendInvitations.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
@@ -1675,30 +1561,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="283">
-          <caret line="16" column="34" lean-forward="true" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/managers/AccountsManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/managers/SessionsManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="25" column="49" lean-forward="true" selection-start-line="25" selection-start-column="49" selection-end-line="25" selection-end-column="49" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/SendMessageToAllPlayers.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="378">
@@ -1711,7 +1573,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="189">
           <caret line="11" column="15" lean-forward="false" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1727,7 +1588,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="189">
           <caret line="11" column="20" lean-forward="false" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1735,43 +1595,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="294">
           <caret line="14" column="1" lean-forward="true" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/NotificationService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="199">
-          <caret line="20" column="46" lean-forward="true" selection-start-line="20" selection-start-column="46" selection-end-line="20" selection-end-column="46" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/AuthService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="38" column="27" lean-forward="false" selection-start-line="38" selection-start-column="27" selection-end-line="38" selection-end-column="27" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Commons/src/models/Response.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="19" selection-end-column="1" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Commons/src/models/Message.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1779,7 +1602,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-420">
           <caret line="16" column="13" lean-forward="false" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1803,7 +1625,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="357">
           <caret line="27" column="34" lean-forward="true" selection-start-line="17" selection-start-column="27" selection-end-line="27" selection-end-column="34" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1811,7 +1632,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
           <caret line="17" column="33" lean-forward="false" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1819,7 +1639,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="230">
           <caret line="24" column="45" lean-forward="true" selection-start-line="24" selection-start-column="45" selection-end-line="24" selection-end-column="45" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1831,14 +1650,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Commons/src/constants/Config.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="525">
-          <caret line="25" column="36" lean-forward="false" selection-start-line="25" selection-start-column="36" selection-end-line="25" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/services/GameService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="285">
@@ -1847,14 +1658,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/proxies/MessageDispatcher.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="545">
-          <caret line="152" column="71" lean-forward="false" selection-start-line="152" selection-start-column="71" selection-end-line="152" selection-end-column="71" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/GamePage.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
@@ -1875,15 +1678,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="220">
           <caret line="19" column="18" lean-forward="false" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="18" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/controllers/GameController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="283">
+        <state relative-caret-position="315">
           <caret line="26" column="19" lean-forward="false" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="19" />
           <folding>
             <element signature="e#936#937#0" expanded="true" />
@@ -1894,7 +1694,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/WaitForPlayers.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1102">
+        <state relative-caret-position="1491">
           <caret line="81" column="0" lean-forward="false" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" />
           <folding />
         </state>
@@ -1902,15 +1702,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/WaitForScore.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="52">
-          <caret line="27" column="25" lean-forward="true" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="25" />
+        <state relative-caret-position="420">
+          <caret line="27" column="25" lean-forward="false" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="25" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/FetchHighscore.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="283">
+        <state relative-caret-position="630">
           <caret line="37" column="42" lean-forward="false" selection-start-line="37" selection-start-column="42" selection-end-line="37" selection-end-column="42" />
           <folding />
         </state>
@@ -1918,8 +1718,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/controllers/MatchRequestController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="18" column="43" lean-forward="true" selection-start-line="18" selection-start-column="43" selection-end-line="18" selection-end-column="43" />
+        <state relative-caret-position="252">
+          <caret line="18" column="43" lean-forward="false" selection-start-line="18" selection-start-column="43" selection-end-line="18" selection-end-column="43" />
           <folding>
             <element signature="e#438#439#0" expanded="true" />
             <element signature="e#488#489#0" expanded="true" />
@@ -1930,7 +1730,7 @@
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/controllers/MatchSetupController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
-          <caret line="14" column="47" lean-forward="true" selection-start-line="14" selection-start-column="47" selection-end-line="14" selection-end-column="47" />
+          <caret line="14" column="47" lean-forward="false" selection-start-line="14" selection-start-column="47" selection-end-line="14" selection-end-column="47" />
           <folding />
         </state>
       </provider>
@@ -1953,8 +1753,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/BeginMatch.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="25" column="37" lean-forward="true" selection-start-line="25" selection-start-column="37" selection-end-line="25" selection-end-column="37" />
+        <state relative-caret-position="357">
+          <caret line="25" column="37" lean-forward="false" selection-start-line="25" selection-start-column="37" selection-end-line="25" selection-end-column="37" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -1967,8 +1767,163 @@
           <caret line="33" column="51" lean-forward="false" selection-start-line="33" selection-start-column="51" selection-end-line="33" selection-end-column="51" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#474#475#0" expanded="true" />
-            <element signature="e#516#517#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/RegisterPage.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="483">
+          <caret line="29" column="13" lean-forward="false" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Commons/src/models/Message.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="24" column="22" lean-forward="true" selection-start-line="24" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Commons/src/models/Response.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="19" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="231">
+          <caret line="11" column="1" lean-forward="true" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="472">
+          <caret line="73" column="121" lean-forward="false" selection-start-line="73" selection-start-column="121" selection-end-line="73" selection-end-column="121" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/dispatchers/MessageDispatcher.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="567">
+          <caret line="36" column="36" lean-forward="false" selection-start-line="36" selection-start-column="36" selection-end-line="36" selection-end-column="36" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/ComputeScore.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/GenerateLetters.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Commons/src/constants/Config.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="399">
+          <caret line="19" column="43" lean-forward="false" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/models/Accounts.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="189">
+          <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/models/Sessions.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="19" column="5" lean-forward="false" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/models/Dictionary.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/models/Match.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="36" column="38" lean-forward="true" selection-start-line="36" selection-start-column="38" selection-end-line="36" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/JedisService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="630">
+          <caret line="40" column="5" lean-forward="true" selection-start-line="40" selection-start-column="5" selection-end-line="40" selection-end-column="5" />
+          <folding>
+            <element signature="e#412#413#0" expanded="true" />
+            <element signature="e#488#489#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/AuthService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="525">
+          <caret line="38" column="27" lean-forward="false" selection-start-line="38" selection-start-column="27" selection-end-line="38" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/NotificationService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="199">
+          <caret line="20" column="46" lean-forward="true" selection-start-line="20" selection-start-column="46" selection-end-line="20" selection-end-column="46" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/ReceiveWordsService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="735">
+          <caret line="44" column="36" lean-forward="false" selection-start-line="44" selection-start-column="36" selection-end-line="44" selection-end-column="36" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <marker date="1500125990386" expanded="true" signature="391:398" ph="/**...*/" />
+            <marker date="1500125990386" expanded="true" signature="1594:1741" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/MessageService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1656">
+          <caret line="79" column="46" lean-forward="false" selection-start-line="79" selection-start-column="36" selection-end-line="79" selection-end-column="46" />
+          <folding>
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/Client/src/com/texttwist/client/App.java b/Client/src/com/texttwist/client/App.java
index e575db2..9008c50 100644
--- a/Client/src/com/texttwist/client/App.java
+++ b/Client/src/com/texttwist/client/App.java
@@ -32,8 +32,8 @@ import java.rmi.server.UnicastRemoteObject;
  */
 public class App extends JFrame {
 
-    private static InetSocketAddress clientTCPSocketAddress = new InetSocketAddress(Config.GameServerURI, Config.GameServerPort);
-    public static InetSocketAddress clientUDPSocketAddress = new InetSocketAddress(Config.WordsReceiverServerURI, Config.WordsReceiverServerPort);
+    private static InetSocketAddress clientTCPSocketAddress = new InetSocketAddress(Config.MessageServiceURI, Config.MessageServicePort);
+    public static InetSocketAddress clientUDPSocketAddress = new InetSocketAddress(Config.WordsReceiverServiceURI, Config.WordsReceiverServicePort);
     private static InetAddress clientMulticastSocketAddress;
 
     public static AuthService authService;
@@ -79,10 +79,10 @@ public class App extends JFrame {
 
     public static void registerForNotifications() throws RemoteException, NotBoundException {
 
-        Registry registry = LocateRegistry.getRegistry(Config.NotificationServerStubPort);
+        Registry registry = LocateRegistry.getRegistry(Config.NotificationServiceStubPort);
         INotificationClient callbackObj = new NotificationClientService();
         notificationStub = (INotificationClient) UnicastRemoteObject.exportObject(callbackObj, 0);
-        INotificationServer notificationServer = (INotificationServer) registry.lookup(Config.NotificationServerName);
+        INotificationServer notificationServer = (INotificationServer) registry.lookup(Config.NotificationServiceName);
         notificationServer.registerForCallback(notificationStub);
     }
 
@@ -98,7 +98,7 @@ public class App extends JFrame {
     public static void openClientMulticastSocket(Integer multicastId){
         try {
             App.gameService.setMulticastId(multicastId);
-            clientMulticastSocketAddress = InetAddress.getByName(Config.ScoreMulticastServerURI);
+            clientMulticastSocketAddress = InetAddress.getByName(Config.ScoreMulticastServiceURI);
             clientMulticast = new MulticastSocket(gameService.multicastId);
             clientMulticast.joinGroup(clientMulticastSocketAddress);
         } catch (IOException e) {
@@ -109,7 +109,7 @@ public class App extends JFrame {
     public static void closeClientMulticastSocket(){
         //Leave group and close multicast socket
         try {
-            App.clientMulticast.leaveGroup(InetAddress.getByName(Config.ScoreMulticastServerURI));
+            App.clientMulticast.leaveGroup(InetAddress.getByName(Config.ScoreMulticastServiceURI));
             App.clientMulticast.close();
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/Client/src/com/texttwist/client/services/AuthService.java b/Client/src/com/texttwist/client/services/AuthService.java
index 5936dcf..61fc19e 100644
--- a/Client/src/com/texttwist/client/services/AuthService.java
+++ b/Client/src/com/texttwist/client/services/AuthService.java
@@ -17,7 +17,7 @@ import java.rmi.RemoteException;
  */
 public class AuthService {
 
-    private String baseUrl = Config.getAuthServerURI().concat("/auth");
+    private String baseUrl = Config.getAuthServiceURI().concat("/auth");
 
     public Response login(String userName, String password) throws RemoteException, NotBoundException, MalformedURLException {
         IAuth auth = (IAuth) Naming.lookup(baseUrl);
diff --git a/Commons/src/constants/Config.java b/Commons/src/constants/Config.java
index c337269..fed33ef 100644
--- a/Commons/src/constants/Config.java
+++ b/Commons/src/constants/Config.java
@@ -6,29 +6,29 @@ package constants;
  */
 public class Config {
 
-    public static String AuthServerURI = "localhost";
-    public static Integer AuthServerPort = 9999;
+    public static String AuthServiceURI = "localhost";
+    public static Integer AuthServicePort = 9999;
 
-    public static String GameServerURI = "localhost";
-    public static Integer GameServerPort = 10000;
+    public static String MessageServiceURI = "localhost";
+    public static Integer MessageServicePort = 10000;
 
-    public static String WordsReceiverServerURI = "localhost";
-    public static Integer WordsReceiverServerPort = 10001;
+    public static String WordsReceiverServiceURI = "localhost";
+    public static Integer WordsReceiverServicePort = 10001;
 
-    public static String ScoreMulticastServerURI = "226.226.226.226";
+    public static String ScoreMulticastServiceURI = "226.226.226.226";
 
-    public static Integer NotificationServerPort = 20000;
-    public static Integer NotificationServerStubPort = 30000;
-    public static String NotificationServerName ="notification";
+    public static Integer NotificationServicePort = 20000;
+    public static Integer NotificationServiceStubPort = 30000;
+    public static String NotificationServiceName ="notification";
 
-    public static String RedisServerURI = "localhost";
+    public static String RedisServiceURI = "localhost";
 
     public static int gameTimeout = 120; //2 minuti in sec
     public static int joinMatchTimeout = 7*1000*60; //7 minuti in millisec
     public static int sendWordsTimeout = 5*1000*60; //5 minuti in millisec
 
-    public static String getAuthServerURI(){
-        return "rmi://".concat(AuthServerURI).concat(":").concat(AuthServerPort.toString());
+    public static String getAuthServiceURI(){
+        return "rmi://".concat(AuthServiceURI).concat(":").concat(AuthServicePort.toString());
     }
 
 }
diff --git a/Server/src/com/texttwist/server/Server.java b/Server/src/com/texttwist/server/Server.java
index aebc817..3a72788 100644
--- a/Server/src/com/texttwist/server/Server.java
+++ b/Server/src/com/texttwist/server/Server.java
@@ -43,7 +43,7 @@ public class Server {
         //Starting Auth service based on RMI
         try {
             auth = new AuthService();
-            Registry authRegistry = LocateRegistry.createRegistry(Config.AuthServerPort);
+            Registry authRegistry = LocateRegistry.createRegistry(Config.AuthServicePort);
             authRegistry.bind("auth", auth);
         } catch (RemoteException e) {
             Server.logger.write("SERVER: RMI authentication service error (Remote exception)");
@@ -54,7 +54,7 @@ public class Server {
 
     private void startJedisService(){
         //Starting Jedis pool for Redis connection
-        jedisPool = new JedisPool(new JedisPoolConfig(), Config.RedisServerURI);
+        jedisPool = new JedisPool(new JedisPoolConfig(), Config.RedisServiceURI);
     }
 
     private void startMessageService(){
@@ -71,11 +71,11 @@ public class Server {
         //Starting Notification service based on RMI
         try {
             notificationServer = new NotificationService();
-            INotificationServer stub = (INotificationServer) UnicastRemoteObject.exportObject(notificationServer, Config.NotificationServerPort);
-            LocateRegistry.createRegistry(Config.NotificationServerStubPort);
+            INotificationServer stub = (INotificationServer) UnicastRemoteObject.exportObject(notificationServer, Config.NotificationServicePort);
+            LocateRegistry.createRegistry(Config.NotificationServiceStubPort);
 
-            Registry notificationRegistry = LocateRegistry.getRegistry(Config.NotificationServerStubPort);
-            notificationRegistry.bind(Config.NotificationServerName, stub);
+            Registry notificationRegistry = LocateRegistry.getRegistry(Config.NotificationServiceStubPort);
+            notificationRegistry.bind(Config.NotificationServiceName, stub);
         } catch (RemoteException e) {
             Server.logger.write("SERVER: RMI notification service error (Remote exception)");
         } catch (AlreadyBoundException e) {
diff --git a/Server/src/com/texttwist/server/proxies/MessageDispatcher.java b/Server/src/com/texttwist/server/dispatchers/MessageDispatcher.java
similarity index 98%
rename from Server/src/com/texttwist/server/proxies/MessageDispatcher.java
rename to Server/src/com/texttwist/server/dispatchers/MessageDispatcher.java
index 3cdee5d..a0f0526 100644
--- a/Server/src/com/texttwist/server/proxies/MessageDispatcher.java
+++ b/Server/src/com/texttwist/server/dispatchers/MessageDispatcher.java
@@ -1,7 +1,7 @@
-package com.texttwist.server.proxies;
+package com.texttwist.server.dispatchers;
 
 import com.texttwist.server.Server;
-import com.texttwist.server.managers.SessionsManager;
+import com.texttwist.server.models.Sessions;
 import com.texttwist.server.models.Match;
 import com.texttwist.server.tasks.*;
 import models.Message;
@@ -33,7 +33,7 @@ public class MessageDispatcher implements Callable<Boolean> {
     public Boolean call() {
         bufferMessage = ByteBuffer.allocate(1024);
         byte[] byteMessage = null;
-        if(SessionsManager.getInstance().isValidToken(request.token)){
+        if(Sessions.getInstance().isValidToken(request.token)){
             switch(request.message){
 
                 case "START_GAME":
diff --git a/Server/src/com/texttwist/server/managers/AccountsManager.java b/Server/src/com/texttwist/server/models/Accounts.java
similarity index 84%
rename from Server/src/com/texttwist/server/managers/AccountsManager.java
rename to Server/src/com/texttwist/server/models/Accounts.java
index 34751ca..6c9513d 100644
--- a/Server/src/com/texttwist/server/managers/AccountsManager.java
+++ b/Server/src/com/texttwist/server/models/Accounts.java
@@ -1,4 +1,4 @@
-package com.texttwist.server.managers;
+package com.texttwist.server.models;
 
 import com.texttwist.server.services.JedisService;
 import models.User;
@@ -8,21 +8,21 @@ import java.util.*;
 
 /**
  * Author:      Lorenzo Iovino on 18/06/2017.
- * Description: AccountsManager
+ * Description: Accounts
  */
-public class AccountsManager {
+public class Accounts {
 
     public List<User> users = Collections.synchronizedList(new ArrayList<User>());
 
     private static class Holder {
-        static final AccountsManager INSTANCE = new AccountsManager();
+        static final Accounts INSTANCE = new Accounts();
     }
 
-    public static AccountsManager getInstance() {
-        return AccountsManager.Holder.INSTANCE;
+    public static Accounts getInstance() {
+        return Accounts.Holder.INSTANCE;
     }
 
-    private AccountsManager(){
+    private Accounts(){
         List<Serializable> l = JedisService.get("users");
         for(int i=0; i<l.size(); i++) {
             users.add((User) l.get(i));
diff --git a/Server/src/com/texttwist/server/managers/SessionsManager.java b/Server/src/com/texttwist/server/models/Sessions.java
similarity index 83%
rename from Server/src/com/texttwist/server/managers/SessionsManager.java
rename to Server/src/com/texttwist/server/models/Sessions.java
index 93fe6ca..e9a2ce1 100644
--- a/Server/src/com/texttwist/server/managers/SessionsManager.java
+++ b/Server/src/com/texttwist/server/models/Sessions.java
@@ -1,4 +1,4 @@
-package com.texttwist.server.managers;
+package com.texttwist.server.models;
 import models.Session;
 import models.User;
 
@@ -9,17 +9,17 @@ import java.util.List;
 
 /**
  * Author:      Lorenzo Iovino on 17/06/2017.
- * Description: SessionsManager. It is a singleton that provides the model and methods for manage sessions
+ * Description: Sessions. It is a singleton that provides the model and methods for manage sessions
  */
-public class SessionsManager {
+public class Sessions {
 
     private List<Session> sessions = Collections.synchronizedList(new ArrayList<Session>());
 
     private static class Holder {
-        static final SessionsManager INSTANCE = new SessionsManager();
+        static final Sessions INSTANCE = new Sessions();
     }
 
-    public static SessionsManager getInstance() {
+    public static Sessions getInstance() {
         return Holder.INSTANCE;
     }
 
diff --git a/Server/src/com/texttwist/server/services/AuthService.java b/Server/src/com/texttwist/server/services/AuthService.java
index d074e71..6cb2f00 100644
--- a/Server/src/com/texttwist/server/services/AuthService.java
+++ b/Server/src/com/texttwist/server/services/AuthService.java
@@ -1,8 +1,8 @@
 package com.texttwist.server.services;
 
 import com.texttwist.server.Server;
-import com.texttwist.server.managers.AccountsManager;
-import com.texttwist.server.managers.SessionsManager;
+import com.texttwist.server.models.Accounts;
+import com.texttwist.server.models.Sessions;
 import constants.Config;
 import interfaces.IAuth;
 import interfaces.INotificationClient;
@@ -24,14 +24,14 @@ public class AuthService extends UnicastRemoteObject implements IAuth {
     private SecureRandom random = new SecureRandom();
 
     public AuthService() throws RemoteException{
-        Server.logger.write("AuthService Service running at "+ Config.AuthServerPort+" port...");
+        Server.logger.write("AuthService Service running at "+ Config.AuthServicePort +" port...");
     }
 
     @Override
     public Response register(String userName, String password) throws RemoteException {
         Server.logger.write("Invoked register with username=" + userName + " AND " + " password=" + password);
         if ((userName != null && !userName.isEmpty()) && (password != null && !password.equals(""))) {
-            if(AccountsManager.getInstance().register(userName, password)){
+            if(Accounts.getInstance().register(userName, password)){
                 Server.logger.write("Registration successfull");
                 return new Response("Registration successfull", 200, null);
             } else {
@@ -46,11 +46,11 @@ public class AuthService extends UnicastRemoteObject implements IAuth {
     public Response login(String userName, String password) throws RemoteException {
         Server.logger.write("Invoked login with username=" + userName + " AND " + " password=" + password);
         if ((userName != null && !userName.isEmpty()) && (password != null && !password.equals(""))) {
-            if(AccountsManager.getInstance().exists(userName) && AccountsManager.getInstance().checkPassword(userName, password)) {
+            if(Accounts.getInstance().exists(userName) && Accounts.getInstance().checkPassword(userName, password)) {
                 JsonObject data = new JsonObject();
                 String token = nextSessionId();
                 data.put("token", token);
-                SessionsManager.getInstance().add(userName,token);
+                Sessions.getInstance().add(userName,token);
                 Server.logger.write("Login successfull");
                 return new Response("Login successfull", 200, data);
             }
@@ -65,14 +65,14 @@ public class AuthService extends UnicastRemoteObject implements IAuth {
         notificationServer.unregisterForCallback(stub);
 
         if ((userName != null && !userName.isEmpty()) && (token != null && !token.isEmpty())) {
-            boolean res = SessionsManager.getInstance().remove(userName);
+            boolean res = Sessions.getInstance().remove(userName);
             if(res) {
                 Server.logger.write("Logout successfull");
 
             }
         }
 
-        SessionsManager.getInstance().remove(userName);
+        Sessions.getInstance().remove(userName);
         Server.logger.write("Logout successfull (but something gone wrong)");
         return new Response("Logout successfull (but something gone wrong)", 200, null);
     }
diff --git a/Server/src/com/texttwist/server/services/MessageService.java b/Server/src/com/texttwist/server/services/MessageService.java
index 2c24899..965092b 100644
--- a/Server/src/com/texttwist/server/services/MessageService.java
+++ b/Server/src/com/texttwist/server/services/MessageService.java
@@ -1,7 +1,7 @@
 package com.texttwist.server.services;
 
 import com.texttwist.server.Server;
-import com.texttwist.server.proxies.MessageDispatcher;
+import com.texttwist.server.dispatchers.MessageDispatcher;
 import com.texttwist.server.models.Dictionary;
 import constants.Config;
 import models.Message;
@@ -27,7 +27,7 @@ public class MessageService implements Runnable{
     private String dictionaryPath = "./Server/resources/dictionary";
     public static Dictionary dict;
 
-    public static Integer multicastId = Config.NotificationServerStubPort;
+    public static Integer multicastId = Config.NotificationServiceStubPort;
 
     public MessageService()
     {
@@ -37,9 +37,9 @@ public class MessageService implements Runnable{
 
             ServerSocketChannel serverSocketChannel = ServerSocketChannel.open();
             serverSocketChannel.configureBlocking(false);
-            serverSocketChannel.socket().bind(new InetSocketAddress(Config.GameServerPort));
+            serverSocketChannel.socket().bind(new InetSocketAddress(Config.MessageServicePort));
             serverSocketChannel.register(selector, OP_ACCEPT);
-            Server.logger.write("GameService Service is running at "+Config.GameServerPort+" port...");
+            Server.logger.write("GameService Service is running at "+Config.MessageServicePort +" port...");
 
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/Server/src/com/texttwist/server/services/NotificationService.java b/Server/src/com/texttwist/server/services/NotificationService.java
index 1bd1763..4da2b09 100644
--- a/Server/src/com/texttwist/server/services/NotificationService.java
+++ b/Server/src/com/texttwist/server/services/NotificationService.java
@@ -21,7 +21,7 @@ public class NotificationService implements INotificationServer {
     private List<INotificationClient> clients;
     public NotificationService() throws RemoteException {
         super();
-        Server.logger.write("Notification Service running at "+ Config.NotificationServerPort+" port...");
+        Server.logger.write("Notification Service running at "+ Config.NotificationServicePort +" port...");
         clients = new ArrayList<>();
     }
 
diff --git a/Server/src/com/texttwist/server/services/ReceiveWordsService.java b/Server/src/com/texttwist/server/services/ReceiveWordsService.java
index 7e9dc4e..b87432e 100644
--- a/Server/src/com/texttwist/server/services/ReceiveWordsService.java
+++ b/Server/src/com/texttwist/server/services/ReceiveWordsService.java
@@ -1,7 +1,7 @@
 package com.texttwist.server.services;
 
 import com.texttwist.server.Server;
-import com.texttwist.server.managers.SessionsManager;
+import com.texttwist.server.models.Sessions;
 import com.texttwist.server.models.Match;
 import com.texttwist.server.tasks.ComputeScore;
 import constants.Config;
@@ -20,7 +20,7 @@ public class ReceiveWordsService implements Runnable {
     private ExecutorService threadPool = Executors.newCachedThreadPool();
 
     public ReceiveWordsService() {
-        Server.logger.write("ReceiveWords Service running at "+Config.WordsReceiverServerPort+" port...");
+        Server.logger.write("ReceiveWords Service running at "+Config.WordsReceiverServicePort +" port...");
     }
 
     @Override
@@ -29,7 +29,7 @@ public class ReceiveWordsService implements Runnable {
         DatagramSocket s = null;
 
         try {
-            s = new DatagramSocket(Config.WordsReceiverServerPort);
+            s = new DatagramSocket(Config.WordsReceiverServicePort);
         } catch (SocketException e) {
             e.printStackTrace();
         }
@@ -48,7 +48,7 @@ public class ReceiveWordsService implements Runnable {
             String rcv = new String(packet.getData());
             if (rcv.startsWith("MESSAGE")) {
                 msg = Message.toMessage(rcv);
-                if(SessionsManager.getInstance().isValidToken(msg.token)) {
+                if(Sessions.getInstance().isValidToken(msg.token)) {
                     Match match = Match.findMatchByPlayerName(msg.sender);
                     threadPool.submit(new ComputeScore(msg.sender, msg.data, match));
                 }
diff --git a/Server/src/com/texttwist/server/tasks/CheckOnlineUsers.java b/Server/src/com/texttwist/server/tasks/CheckOnlineUsers.java
index 988a6fe..b68c592 100644
--- a/Server/src/com/texttwist/server/tasks/CheckOnlineUsers.java
+++ b/Server/src/com/texttwist/server/tasks/CheckOnlineUsers.java
@@ -1,6 +1,6 @@
 package com.texttwist.server.tasks;
 
-import com.texttwist.server.managers.SessionsManager;
+import com.texttwist.server.models.Sessions;
 
 import javax.swing.*;
 import java.util.concurrent.Callable;
@@ -19,7 +19,7 @@ public class CheckOnlineUsers implements Callable<Boolean> {
     @Override
     public Boolean call() throws Exception {
         for(int i = 0; i < users.size(); i++){
-            if(!(SessionsManager.getInstance().exists(users.get(i)))){
+            if(!(Sessions.getInstance().exists(users.get(i)))){
                 return false;
             }
         }
diff --git a/Server/src/com/texttwist/server/tasks/ComputeHighscores.java b/Server/src/com/texttwist/server/tasks/ComputeHighscores.java
index 884c2a6..79a9d48 100644
--- a/Server/src/com/texttwist/server/tasks/ComputeHighscores.java
+++ b/Server/src/com/texttwist/server/tasks/ComputeHighscores.java
@@ -1,6 +1,6 @@
 package com.texttwist.server.tasks;
 
-import com.texttwist.server.managers.AccountsManager;
+import com.texttwist.server.models.Accounts;
 import com.texttwist.server.services.JedisService;
 import models.User;
 
@@ -18,16 +18,16 @@ public class ComputeHighscores implements Callable<DefaultListModel<String>> {
     public DefaultListModel<String> call() throws Exception {
         DefaultListModel<String> l = new DefaultListModel<>();
 
-        AccountsManager.getInstance().users.sort(new Comparator<User>() {
+        Accounts.getInstance().users.sort(new Comparator<User>() {
             @Override
             public int compare(User o1, User o2) {
                 return o2.score.compareTo(o1.score);
             }
         });
         JedisService.removeAll("users");
-        for(int i = 0; i< AccountsManager.getInstance().users.size(); i++){
-            l.addElement(AccountsManager.getInstance().users.get(i).userName+":"+ AccountsManager.getInstance().users.get(i).score);
-            JedisService.add("users", AccountsManager.getInstance().users.get(i));
+        for(int i = 0; i< Accounts.getInstance().users.size(); i++){
+            l.addElement(Accounts.getInstance().users.get(i).userName+":"+ Accounts.getInstance().users.get(i).score);
+            JedisService.add("users", Accounts.getInstance().users.get(i));
         }
         return l;
     }
diff --git a/Server/src/com/texttwist/server/tasks/ComputeScore.java b/Server/src/com/texttwist/server/tasks/ComputeScore.java
index b19d4e0..790282a 100644
--- a/Server/src/com/texttwist/server/tasks/ComputeScore.java
+++ b/Server/src/com/texttwist/server/tasks/ComputeScore.java
@@ -1,6 +1,6 @@
 package com.texttwist.server.tasks;
 
-import com.texttwist.server.managers.AccountsManager;
+import com.texttwist.server.models.Accounts;
 import com.texttwist.server.models.Dictionary;
 import com.texttwist.server.models.Match;
 import models.User;
@@ -35,7 +35,7 @@ public class ComputeScore implements Callable<Integer> {
         }
         match.setScore(sender, score);
 
-        User u = AccountsManager.getInstance().findUser(sender);
+        User u = Accounts.getInstance().findUser(sender);
         u.addScore(score);
 
         if(match.allPlayersSendedHisScore()) {
diff --git a/Server/src/com/texttwist/server/tasks/SendScores.java b/Server/src/com/texttwist/server/tasks/SendScores.java
index 69569ce..41acc1b 100644
--- a/Server/src/com/texttwist/server/tasks/SendScores.java
+++ b/Server/src/com/texttwist/server/tasks/SendScores.java
@@ -29,7 +29,7 @@ public class SendScores implements Callable<Void> {
         MulticastSocket multicastSocket = null;
         try {
             multicastSocket = new MulticastSocket(match.multicastId);
-            InetAddress ia = InetAddress.getByName(Config.ScoreMulticastServerURI);
+            InetAddress ia = InetAddress.getByName(Config.ScoreMulticastServiceURI);
             DatagramPacket hi = new DatagramPacket(msg.toString().getBytes(), msg.toString().length(), ia, match.multicastId);
             multicastSocket.send(hi);
         } catch (IOException e) {