diff --git a/.idea/libraries/GOPATH__vncproxy_.xml b/.idea/libraries/GOPATH__vncproxy_.xml
index 7c966c1..1236707 100644
--- a/.idea/libraries/GOPATH__vncproxy_.xml
+++ b/.idea/libraries/GOPATH__vncproxy_.xml
@@ -1,6 +1,8 @@
 <component name="libraryTable">
   <library name="GOPATH &lt;vncproxy&gt;">
     <CLASSES>
+      <root url="file://$PROJECT_DIR$/../srf.storage" />
+      <root url="file://$USER_HOME$/srf/experience.center.opb/src/sourcegraph.com" />
       <root url="file://$PROJECT_DIR$/../elastictrail" />
       <root url="file://$PROJECT_DIR$/../gopkg.in" />
       <root url="file://$PROJECT_DIR$/../vncproxy1" />
@@ -18,11 +20,11 @@
       <root url="file://$USER_HOME$/srf/experience.center.opb/src/golang.org" />
       <root url="file://$USER_HOME$/srf/experience.center.opb/src/srf" />
       <root url="file://$USER_HOME$/srf/experience.center.opb/src/version" />
-      <root url="file://$PROJECT_DIR$/../srf.storage" />
-      <root url="file://$USER_HOME$/srf/experience.center.opb/src/sourcegraph.com" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
+      <root url="file://$PROJECT_DIR$/../srf.storage" />
+      <root url="file://$USER_HOME$/srf/experience.center.opb/src/sourcegraph.com" />
       <root url="file://$PROJECT_DIR$/../elastictrail" />
       <root url="file://$PROJECT_DIR$/../gopkg.in" />
       <root url="file://$PROJECT_DIR$/../vncproxy1" />
@@ -40,8 +42,6 @@
       <root url="file://$USER_HOME$/srf/experience.center.opb/src/golang.org" />
       <root url="file://$USER_HOME$/srf/experience.center.opb/src/srf" />
       <root url="file://$USER_HOME$/srf/experience.center.opb/src/version" />
-      <root url="file://$PROJECT_DIR$/../srf.storage" />
-      <root url="file://$USER_HOME$/srf/experience.center.opb/src/sourcegraph.com" />
     </SOURCES>
     <excluded>
       <root url="file://$PROJECT_DIR$" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3e60343..454ea7c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,20 +2,42 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="a5d84862-9821-4d30-9a77-6235b55d6727" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/common/conn-interfaces.go" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/client/color.go" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/server/ws_test.go" afterPath="" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/common/client-message.go" afterPath="$PROJECT_DIR$/common/client-message-type.go" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/common/encoding.go" afterPath="$PROJECT_DIR$/common/if-encoding.go" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/common/readers.go" afterPath="$PROJECT_DIR$/common/rfb-reader-helper.go" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/common/server-message.go" afterPath="$PROJECT_DIR$/common/server-message-type.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/GOPATH__vncproxy_.xml" afterPath="$PROJECT_DIR$/.idea/libraries/GOPATH__vncproxy_.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/client/client-conn.go" afterPath="$PROJECT_DIR$/client/client-conn.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/client/client_auth_test.go" afterPath="$PROJECT_DIR$/client/client_auth_test.go" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/client/server-messages.go" afterPath="$PROJECT_DIR$/client/server-messages.go" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/common/client-message.go" afterPath="$PROJECT_DIR$/common/client-message.go" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/common/encoding.go" afterPath="$PROJECT_DIR$/common/encoding.go" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/common/server-message.go" afterPath="$PROJECT_DIR$/common/server-message.go" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/logger/logger.go" afterPath="$PROJECT_DIR$/logger/logger.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/common/rectangle.go" afterPath="$PROJECT_DIR$/common/rectangle.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/encodings/enc-copy-rect.go" afterPath="$PROJECT_DIR$/encodings/enc-copy-rect.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/encodings/enc-corre.go" afterPath="$PROJECT_DIR$/encodings/enc-corre.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/encodings/enc-cursor-pseudo.go" afterPath="$PROJECT_DIR$/encodings/enc-cursor-pseudo.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/encodings/enc-hextile.go" afterPath="$PROJECT_DIR$/encodings/enc-hextile.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/encodings/enc-pseudo.go" afterPath="$PROJECT_DIR$/encodings/enc-pseudo.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/encodings/enc-raw.go" afterPath="$PROJECT_DIR$/encodings/enc-raw.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/encodings/enc-rre.go" afterPath="$PROJECT_DIR$/encodings/enc-rre.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/encodings/enc-tight.go" afterPath="$PROJECT_DIR$/encodings/enc-tight.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/encodings/enc-tightpng.go" afterPath="$PROJECT_DIR$/encodings/enc-tightpng.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/encodings/enc-zlib.go" afterPath="$PROJECT_DIR$/encodings/enc-zlib.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/encodings/enc-zrle.go" afterPath="$PROJECT_DIR$/encodings/enc-zrle.go" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/main.go" afterPath="$PROJECT_DIR$/main.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/player/fbs-play-listener.go" afterPath="$PROJECT_DIR$/player/fbs-play-listener.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/player/fbs-reader.go" afterPath="$PROJECT_DIR$/player/fbs-reader.go" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/player/player_test.go" afterPath="$PROJECT_DIR$/player/player_test.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/proxy/message-listeners.go" afterPath="$PROJECT_DIR$/proxy/message-listeners.go" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/proxy/proxy.go" afterPath="$PROJECT_DIR$/proxy/proxy.go" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/proxy/proxy_test.go" afterPath="$PROJECT_DIR$/proxy/proxy_test.go" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/client-messages.go" afterPath="$PROJECT_DIR$/server/client-messages.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/security.go" afterPath="$PROJECT_DIR$/server/security.go" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/server-conn.go" afterPath="$PROJECT_DIR$/server/server-conn.go" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/server.go" afterPath="$PROJECT_DIR$/server/server.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/server_test.go" afterPath="$PROJECT_DIR$/server/server_test.go" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/ws-server-go.go" afterPath="$PROJECT_DIR$/server/ws-server-go.go" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tee-listeners/recorder.go" afterPath="$PROJECT_DIR$/tee-listeners/recorder.go" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -29,9 +51,6 @@
   <component name="CompilerWorkspaceConfiguration">
     <option name="MAKE_PROJECT_ON_SAVE" value="true" />
   </component>
-  <component name="CoverageDataManager">
-    <SUITE FILE_PATH="coverage/vncproxy$test_server_.coverage" NAME="test server  Coverage Results" MODIFIED="1498056094294" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="GoCoverage" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
-  </component>
   <component name="DatabaseView">
     <option name="SHOW_INTERMEDIATE" value="true" />
     <option name="GROUP_SCHEMA" value="true" />
@@ -41,69 +60,76 @@
     <option name="SHOW_EMPTY_GROUPS" value="false" />
     <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FavoritesManager">
     <favorites_list name="vncproxy" />
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="client-conn.go" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/client/client-conn.go">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="7305">
-              <caret line="496" column="8" lean-forward="false" selection-start-line="496" selection-start-column="8" selection-end-line="496" selection-end-column="8" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="ws-server-go.go" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/server/ws-server-go.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="675">
-              <caret line="52" column="33" lean-forward="false" selection-start-line="52" selection-start-column="33" selection-end-line="52" selection-end-column="33" />
+            <state relative-caret-position="111">
+              <caret line="15" column="10" lean-forward="true" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server.go" pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/srf/experience.center.opb/src/golang.org/x/net/websocket/server.go">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1590">
-              <caret line="111" column="20" lean-forward="false" selection-start-line="111" selection-start-column="6" selection-end-line="111" selection-end-column="20" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="fbs-reader.go" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/player/fbs-reader.go">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="19" column="0" lean-forward="false" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="player_test.go" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/player/player_test.go">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="75">
-              <caret line="5" column="10" lean-forward="false" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
-              <folding>
-                <element signature="n#!!block;n#loadFbsFile#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="server-conn.go" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/server/server-conn.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2475">
-              <caret line="172" column="0" lean-forward="false" selection-start-line="172" selection-start-column="0" selection-end-line="172" selection-end-column="0" />
+            <state relative-caret-position="466">
+              <caret line="214" column="5" lean-forward="true" selection-start-line="214" selection-start-column="5" selection-end-line="214" selection-end-column="5" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="server-message-type.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/server-message-type.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="45">
+              <caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="multiListener.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/multiListener.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="270">
+              <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pointer.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/client/pointer.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="105">
+              <caret line="7" column="15" lean-forward="false" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="server_test.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/server/server_test.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="374">
+              <caret line="36" column="27" lean-forward="true" selection-start-line="36" selection-start-column="27" selection-end-line="36" selection-end-column="27" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pixel-format.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/client/pixel-format.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -112,36 +138,30 @@
       <file leaf-file-name="server.go" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/server/server.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="645">
-              <caret line="49" column="0" lean-forward="false" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" />
+            <state relative-caret-position="-975">
+              <caret line="24" column="1" lean-forward="true" selection-start-line="24" selection-start-column="1" selection-end-line="24" selection-end-column="1" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="proxy.go" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/proxy/proxy.go">
+      <file leaf-file-name="security.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/server/security.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="345">
-              <caret line="180" column="0" lean-forward="true" selection-start-line="180" selection-start-column="0" selection-end-line="180" selection-end-column="0" />
+            <state relative-caret-position="1006">
+              <caret line="82" column="0" lean-forward="true" selection-start-line="82" selection-start-column="0" selection-end-line="82" selection-end-column="0" />
               <folding>
-                <element signature="n#!!block;n#createClientConnection#0" expanded="false" />
-                <element signature="n#!!block;n#getTargetServerFromSession#0" expanded="false" />
-                <element signature="n#!!block;n#newServerConnHandler#0" expanded="false" />
-                <element signature="n#!!block;n#StartListening#0" expanded="false" />
-                <marker date="1500386875000" expanded="false" signature="22:26" ph="..." />
-                <marker date="1500386875000" expanded="true" signature="5091:5092" ph="{...}" />
-                <marker date="1500386875000" expanded="true" signature="5091:5096" ph="{...}" />
+                <element signature="e#16#100#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="proxy_test.go" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/proxy/proxy_test.go">
+      <file leaf-file-name="handlers.go" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/server/handlers.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="315">
-              <caret line="21" column="5" lean-forward="true" selection-start-line="21" selection-start-column="5" selection-end-line="21" selection-end-column="5" />
+            <state relative-caret-position="242">
+              <caret line="71" column="18" lean-forward="true" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
               <folding />
             </state>
           </provider>
@@ -158,12 +178,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>pseudoenc</find>
-      <find>pseudoenco</find>
-      <find>pseudoencod</find>
-      <find>pseudoencoding</find>
-      <find>[Debug] ###############rect################: 0</find>
-      <find>[Debug] ###############rect################:</find>
       <find>[Debug] ###############rect################</find>
       <find>[Debug] ###############rect###############</find>
       <find>Debug] ###############rect###############</find>
@@ -188,6 +202,12 @@
       <find>serveWebSocket</find>
       <find>act</find>
       <find>ReadSegment</find>
+      <find>clientfe</find>
+      <find>calcTightBytePerPixel</find>
+      <find>Keys</find>
+      <find>iclientconn</find>
+      <find>PointerEvent</find>
+      <find>FrameBufferUpdateMessage</find>
     </findStrings>
     <dirStrings>
       <dir>C:\Users\betzalel\Dropbox\go\src\vncproxy</dir>
@@ -204,15 +224,12 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/server/client-messages.go" />
         <option value="$PROJECT_DIR$/vnc/pixel-format.go" />
         <option value="$PROJECT_DIR$/server/handlers.go" />
         <option value="$PROJECT_DIR$/server/ws-test.go" />
         <option value="$PROJECT_DIR$/client/pixel-format.go" />
         <option value="$PROJECT_DIR$/server/ws-server.go" />
         <option value="$PROJECT_DIR$/server/ws_test.go" />
-        <option value="$PROJECT_DIR$/server/security.go" />
-        <option value="$PROJECT_DIR$/server/server_test.go" />
         <option value="$PROJECT_DIR$/encodings/enc-tight.go" />
         <option value="$PROJECT_DIR$/client/client_auth.go" />
         <option value="$PROJECT_DIR$/server/server.go" />
@@ -220,10 +237,7 @@
         <option value="$PROJECT_DIR$/common/logger.go" />
         <option value="$PROJECT_DIR$/logger/logger.go" />
         <option value="$PROJECT_DIR$/common/readers.go" />
-        <option value="$PROJECT_DIR$/common/server-message.go" />
-        <option value="$PROJECT_DIR$/common/encoding.go" />
         <option value="$PROJECT_DIR$/encodings/enc-copy-rect.go" />
-        <option value="$PROJECT_DIR$/client/server-messages.go" />
         <option value="$PROJECT_DIR$/proxy/proxy_test.go" />
         <option value="$PROJECT_DIR$/encodings/enc-pseudo.go" />
         <option value="$PROJECT_DIR$/tee-listeners/recorder.go" />
@@ -231,11 +245,19 @@
         <option value="$PROJECT_DIR$/common/client-message.go" />
         <option value="$PROJECT_DIR$/client/client-conn.go" />
         <option value="$PROJECT_DIR$/proxy/proxy.go" />
-        <option value="$PROJECT_DIR$/server/server-conn.go" />
-        <option value="$PROJECT_DIR$/server/ws-server-go.go" />
         <option value="$PROJECT_DIR$/player/fbs-reader.go" />
         <option value="$PROJECT_DIR$/player/FBSPlayListener.go" />
         <option value="$PROJECT_DIR$/player/player_test.go" />
+        <option value="$PROJECT_DIR$/server/client-messages.go" />
+        <option value="$PROJECT_DIR$/server/security.go" />
+        <option value="$PROJECT_DIR$/common/client-message-type.go" />
+        <option value="$PROJECT_DIR$/common/server-message.go" />
+        <option value="$PROJECT_DIR$/common/conn-interfaces.go" />
+        <option value="$PROJECT_DIR$/common/encoding.go" />
+        <option value="$PROJECT_DIR$/client/server-messages.go" />
+        <option value="$PROJECT_DIR$/server/server_test.go" />
+        <option value="$PROJECT_DIR$/server/ws-server-go.go" />
+        <option value="$PROJECT_DIR$/server/server-conn.go" />
       </list>
     </option>
   </component>
@@ -248,7 +270,7 @@
   <component name="MavenProjectNavigator">
     <treeState />
   </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" fullScreen="true">
     <option name="width" value="1280" />
     <option name="height" value="800" />
   </component>
@@ -305,250 +327,36 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
+      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="External Libraries" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="GOPATH &lt;vncproxy&gt;" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="External Libraries" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="GOPATH &lt;vncproxy&gt;" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="golang.org" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="x" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="External Libraries" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="GOPATH &lt;vncproxy&gt;" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="golang.org" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="x" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="net" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="External Libraries" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="GOPATH &lt;vncproxy&gt;" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="golang.org" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="x" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="net" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="websocket" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="External Libraries" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="tee-listeners" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <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>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="proxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="player" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="encodings" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="common" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="vncproxy" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="client" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
+          <expand>
+            <path>
+              <item name="vncproxy" type="b2602c69:ProjectViewProjectNode" />
+              <item name="vncproxy" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="vncproxy" type="b2602c69:ProjectViewProjectNode" />
+              <item name="vncproxy" type="462c0819:PsiDirectoryNode" />
+              <item name="client" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="vncproxy" type="b2602c69:ProjectViewProjectNode" />
+              <item name="vncproxy" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="vncproxy" type="b2602c69:ProjectViewProjectNode" />
+              <item name="vncproxy" type="462c0819:PsiDirectoryNode" />
+              <item name="server" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
         </subPane>
       </pane>
       <pane id="PackagesPane" />
-      <pane id="Scratches" />
-      <pane id="Scope">
-        <subPane subId="Project Files">
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="vncproxy">
-              <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="vncproxy">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="client">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -558,7 +366,6 @@
     <property name="settings.editor.selected.configurable" value="project.propCompiler" />
     <property name="DefaultGoTemplateProperty" value="Go File" />
     <property name="SearchEverywhereHistoryKey" value="clientcon&#9;FILE&#9;file://C:/Users/betzalel/Dropbox/go/src/vncproxy/client/client-conn.go&#10;main&#9;FILE&#9;file://C:/Users/betzalel/Dropbox/go/src/vncproxy/main.go&#10;proxy_test&#9;FILE&#9;file://C:/Users/betzalel/Dropbox/go/src/vncproxy/proxy/proxy_test.go&#10;proxy&#9;FILE&#9;file://C:/Users/betzalel/Dropbox/go/src/vncproxy/proxy/proxy.go&#10;generate&#9;ACTION&#9;Maven.GenerateGroup&#10;implement&#9;ACTION&#9;GotoImplementation" />
-    <property name="FullScreen" value="true" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -572,13 +379,176 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Go Test.test player">
+  <component name="RunManager">
+    <configuration name="Server" type="GoApplicationRunConfiguration" factoryName="Go Application">
+      <module name="vncproxy" />
+      <working_directory value="$PROJECT_DIR$" />
+      <go_parameters value="-i" />
+      <filePath value="C:\Users\betzalel\Dropbox\go\src\vncproxy\server\main.go" />
+      <kind value="FILE" />
+      <package value="vncproxy" />
+    </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <module />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+    </configuration>
+    <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
+      <option name="BCName" value="" />
+      <option name="IOSSimulatorSdkPath" value="" />
+      <option name="adlOptions" value="" />
+      <option name="airProgramParameters" value="" />
+      <option name="appDescriptorForEmulator" value="Android" />
+      <option name="debugTransport" value="USB" />
+      <option name="debuggerSdkRaw" value="BC SDK" />
+      <option name="emulator" value="NexusOne" />
+      <option name="emulatorAdlOptions" value="" />
+      <option name="fastPackaging" value="true" />
+      <option name="fullScreenHeight" value="0" />
+      <option name="fullScreenWidth" value="0" />
+      <option name="launchUrl" value="false" />
+      <option name="launcherParameters">
+        <LauncherParameters>
+          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
+          <option name="launcherType" value="OSDefault" />
+          <option name="newPlayerInstance" value="false" />
+          <option name="playerPath" value="FlashPlayerDebugger.exe" />
+        </LauncherParameters>
+      </option>
+      <option name="mobileRunTarget" value="Emulator" />
+      <option name="moduleName" value="" />
+      <option name="overriddenMainClass" value="" />
+      <option name="overriddenOutputFileName" value="" />
+      <option name="overrideMainClass" value="false" />
+      <option name="runTrusted" value="true" />
+      <option name="screenDpi" value="0" />
+      <option name="screenHeight" value="0" />
+      <option name="screenWidth" value="0" />
+      <option name="url" value="http://" />
+      <option name="usbDebugPort" value="7936" />
+    </configuration>
+    <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
+      <option name="BCName" value="" />
+      <option name="launcherParameters">
+        <LauncherParameters>
+          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
+          <option name="launcherType" value="OSDefault" />
+          <option name="newPlayerInstance" value="false" />
+          <option name="playerPath" value="FlashPlayerDebugger.exe" />
+        </LauncherParameters>
+      </option>
+      <option name="moduleName" value="" />
+      <option name="trusted" value="true" />
+    </configuration>
+    <configuration default="true" type="GoApplicationRunConfiguration" factoryName="Go Application">
+      <module name="vncproxy" />
+      <working_directory value="$PROJECT_DIR$" />
+      <go_parameters value="-i" />
+      <filePath value="C:\Users\betzalel\Dropbox\go\src\vncproxy" />
+      <kind value="FILE" />
+      <package value="vncproxy" />
+    </configuration>
+    <configuration default="true" type="GoTestRunConfiguration" factoryName="Go Test">
+      <module name="vncproxy" />
+      <working_directory value="$PROJECT_DIR$" />
+      <go_parameters value="-i" />
+      <framework value="gotest" />
+      <kind value="DIRECTORY" />
+      <package value="vncproxy" />
+      <directory value="$PROJECT_DIR$" />
+      <filePath value="$PROJECT_DIR$" />
+    </configuration>
+    <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
+      <setting name="vmparams" value="" />
+      <setting name="cmdLine" value="run-app" />
+      <setting name="passParentEnv" value="true" />
+      <setting name="launchBrowser" value="true" />
+      <setting name="launchBrowserUrl" value="" />
+      <setting name="depsClasspath" value="false" />
+    </configuration>
+    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <gulpfile />
+      <tasks />
+      <arguments />
+      <envs />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
     <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
       <module name="" />
       <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
       <option name="PROGRAM_PARAMETERS" />
       <predefined_log_file id="idea.log" enabled="true" />
-      <method />
+    </configuration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <envs />
+      <properties />
+      <listeners />
     </configuration>
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App">
       <module name="" />
@@ -635,29 +605,6 @@
       </Profilers>
       <method />
     </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <module />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
     <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="" />
@@ -739,69 +686,11 @@
       <envs />
       <method />
     </configuration>
-    <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
-      <option name="BCName" value="" />
-      <option name="IOSSimulatorSdkPath" value="" />
-      <option name="adlOptions" value="" />
-      <option name="airProgramParameters" value="" />
-      <option name="appDescriptorForEmulator" value="Android" />
-      <option name="debugTransport" value="USB" />
-      <option name="debuggerSdkRaw" value="BC SDK" />
-      <option name="emulator" value="NexusOne" />
-      <option name="emulatorAdlOptions" value="" />
-      <option name="fastPackaging" value="true" />
-      <option name="fullScreenHeight" value="0" />
-      <option name="fullScreenWidth" value="0" />
-      <option name="launchUrl" value="false" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="mobileRunTarget" value="Emulator" />
-      <option name="moduleName" value="" />
-      <option name="overriddenMainClass" value="" />
-      <option name="overriddenOutputFileName" value="" />
-      <option name="overrideMainClass" value="false" />
-      <option name="runTrusted" value="true" />
-      <option name="screenDpi" value="0" />
-      <option name="screenHeight" value="0" />
-      <option name="screenWidth" value="0" />
-      <option name="url" value="http://" />
-      <option name="usbDebugPort" value="7936" />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
-      <option name="BCName" value="" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="moduleName" value="" />
-      <option name="trusted" value="true" />
-      <method />
-    </configuration>
     <configuration default="true" type="GoAppEngineRunConfiguration" factoryName="Go App Engine">
       <module name="vncproxy" />
       <working_directory value="$PROJECT_DIR$" />
       <method />
     </configuration>
-    <configuration default="true" type="GoApplicationRunConfiguration" factoryName="Go Application">
-      <module name="vncproxy" />
-      <working_directory value="$PROJECT_DIR$" />
-      <go_parameters value="-i" />
-      <filePath value="C:\Users\betzalel\Dropbox\go\src\vncproxy" />
-      <kind value="FILE" />
-      <package value="vncproxy" />
-      <method />
-    </configuration>
     <configuration default="true" type="GoRemoteDebugConfigurationType" factoryName="Go Remote">
       <method />
     </configuration>
@@ -811,17 +700,6 @@
       <filePath value="$PROJECT_DIR$" />
       <method />
     </configuration>
-    <configuration default="true" type="GoTestRunConfiguration" factoryName="Go Test">
-      <module name="vncproxy" />
-      <working_directory value="$PROJECT_DIR$" />
-      <go_parameters value="-i" />
-      <framework value="gotest" />
-      <kind value="DIRECTORY" />
-      <package value="vncproxy" />
-      <directory value="$PROJECT_DIR$" />
-      <filePath value="$PROJECT_DIR$" />
-      <method />
-    </configuration>
     <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -838,36 +716,6 @@
       </ExternalSystemSettings>
       <method />
     </configuration>
-    <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
-      <setting name="vmparams" value="" />
-      <setting name="cmdLine" value="run-app" />
-      <setting name="passParentEnv" value="true" />
-      <setting name="launchBrowser" value="true" />
-      <setting name="launchBrowserUrl" value="" />
-      <setting name="depsClasspath" value="false" />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
     <configuration default="true" type="JarApplication" factoryName="JAR Application">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <envs />
@@ -930,57 +778,12 @@
       <envs />
       <method />
     </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
     <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="" />
       <envs />
       <method />
     </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <gulpfile />
-      <tasks />
-      <arguments />
-      <envs />
-      <method />
-    </configuration>
     <configuration default="true" type="js.build_tools.npm" factoryName="npm">
       <command value="run" />
       <scripts />
@@ -994,46 +797,14 @@
     <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
       <method />
     </configuration>
-    <configuration default="false" name="Server" type="GoApplicationRunConfiguration" factoryName="Go Application">
-      <module name="vncproxy" />
-      <working_directory value="$PROJECT_DIR$" />
-      <go_parameters value="-i" />
-      <filePath value="C:\Users\betzalel\Dropbox\go\src\vncproxy\server\main.go" />
-      <kind value="FILE" />
-      <package value="vncproxy" />
-      <method />
-    </configuration>
-    <configuration default="false" name="test server " type="GoTestRunConfiguration" factoryName="Go Test">
-      <module name="vncproxy" />
-      <working_directory value="$PROJECT_DIR$" />
-      <go_parameters value="-i" />
-      <framework value="gotest" />
-      <kind value="FILE" />
-      <package value="vncproxy" />
-      <directory value="$PROJECT_DIR$/server/server_test.go" />
-      <filePath value="$PROJECT_DIR$/server/server_test.go" />
-      <method />
-    </configuration>
-    <configuration default="false" name="main" type="GoApplicationRunConfiguration" factoryName="Go Application">
+    <configuration name="main" type="GoApplicationRunConfiguration" factoryName="Go Application">
       <module name="vncproxy" />
       <working_directory value="C:\Users\betzalel\Dropbox\go\src\vncproxy" />
       <go_parameters value="-i" />
       <filePath value="C:\Users\betzalel\Dropbox\go\src\vncproxy\main.go" />
       <kind value="FILE" />
-      <method />
     </configuration>
-    <configuration default="false" name="test proxy" type="GoTestRunConfiguration" factoryName="Go Test">
-      <module name="vncproxy" />
-      <working_directory value="$PROJECT_DIR$" />
-      <go_parameters value="-i" />
-      <framework value="gotest" />
-      <kind value="FILE" />
-      <package value="vncproxy" />
-      <directory value="$PROJECT_DIR$/proxy/proxy_test.go" />
-      <filePath value="$PROJECT_DIR$/proxy/proxy_test.go" />
-      <method />
-    </configuration>
-    <configuration default="false" name="test player" type="GoTestRunConfiguration" factoryName="Go Test">
+    <configuration name="test player" type="GoTestRunConfiguration" factoryName="Go Test">
       <module name="vncproxy" />
       <working_directory value="$PROJECT_DIR$" />
       <go_parameters value="-i" />
@@ -1042,14 +813,33 @@
       <package value="vncproxy/player" />
       <directory value="$PROJECT_DIR$" />
       <filePath value="$PROJECT_DIR$/player" />
-      <method />
+    </configuration>
+    <configuration name="test proxy" type="GoTestRunConfiguration" factoryName="Go Test">
+      <module name="vncproxy" />
+      <working_directory value="$PROJECT_DIR$" />
+      <go_parameters value="-i" />
+      <framework value="gotest" />
+      <kind value="FILE" />
+      <package value="vncproxy" />
+      <directory value="$PROJECT_DIR$/proxy/proxy_test.go" />
+      <filePath value="$PROJECT_DIR$/proxy/proxy_test.go" />
+    </configuration>
+    <configuration name="test server " type="GoTestRunConfiguration" factoryName="Go Test">
+      <module name="vncproxy" />
+      <working_directory value="$PROJECT_DIR$" />
+      <go_parameters value="-i" />
+      <framework value="gotest" />
+      <kind value="FILE" />
+      <package value="vncproxy" />
+      <directory value="$PROJECT_DIR$/server/server_test.go" />
+      <filePath value="$PROJECT_DIR$/server/server_test.go" />
     </configuration>
     <list size="5">
       <item index="0" class="java.lang.String" itemvalue="Go Application.Server" />
-      <item index="1" class="java.lang.String" itemvalue="Go Test.test server " />
-      <item index="2" class="java.lang.String" itemvalue="Go Application.main" />
+      <item index="1" class="java.lang.String" itemvalue="Go Application.main" />
+      <item index="2" class="java.lang.String" itemvalue="Go Test.test player" />
       <item index="3" class="java.lang.String" itemvalue="Go Test.test proxy" />
-      <item index="4" class="java.lang.String" itemvalue="Go Test.test player" />
+      <item index="4" class="java.lang.String" itemvalue="Go Test.test server " />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -1076,7 +866,9 @@
       <workItem from="1499416701375" duration="1802000" />
       <workItem from="1499522471716" duration="431000" />
       <workItem from="1499965517741" duration="5709000" />
-      <workItem from="1500411167182" duration="1498000" />
+      <workItem from="1500411167182" duration="1877000" />
+      <workItem from="1500413400696" duration="152000" />
+      <workItem from="1500413585910" duration="2404000" />
     </task>
     <servers />
   </component>
@@ -1113,7 +905,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="64853000" />
+    <option name="totallyTimeSpent" value="67788000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1125,26 +917,25 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1280" height="800" extended-state="6" />
+    <frame x="0" y="0" width="1280" height="800" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" 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="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.49030694" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Nl-Palette" 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="0" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" 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="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" 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" />
       <window_info id="Capture Analysis" 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="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13972603" sideWeight="0.31260097" order="8" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26409903" sideWeight="0.54846525" order="8" 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.32956383" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.30136988" sideWeight="0.49676898" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22420909" sideWeight="0.49353796" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.4676898" order="10" side_tool="false" content_ui="tabs" />
-      <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="3" 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.32876712" sideWeight="0.49030694" order="11" 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="1" 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="2" 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.19951534" sideWeight="0.6718266" order="7" 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.32229403" sideWeight="0.6718266" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Problems" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.21506849" sideWeight="0.49676898" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26409903" sideWeight="0.45153475" order="2" 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.3029079" sideWeight="0.48367348" order="6" 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.24959612" 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="3" side_tool="false" content_ui="tabs" />
@@ -1152,18 +943,19 @@
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35068494" sideWeight="0.687399" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2714055" sideWeight="0.32817337" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Nl-Palette" 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="0" side_tool="false" content_ui="tabs" />
       <window_info id="Message" 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="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <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="3" side_tool="false" content_ui="tabs" />
       <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="Dynamic 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="3" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" 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="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="6" 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.33" sideWeight="0.5" order="3" 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.39863014" sideWeight="0.49030694" order="2" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="processedProjectFiles" value="true" />
+    <option name="version" value="1" />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
@@ -1196,112 +988,10 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/client/client-conn.go</url>
-          <line>397</line>
-          <option name="timeStamp" value="93" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/client/client-conn.go</url>
-          <line>345</line>
-          <option name="timeStamp" value="109" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/tee-listeners/recorder.go</url>
-          <line>161</line>
-          <option name="timeStamp" value="112" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/tee-listeners/recorder.go</url>
-          <line>168</line>
-          <option name="timeStamp" value="113" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/client/client-conn.go</url>
-          <line>518</line>
-          <option name="timeStamp" value="116" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/client/client-conn.go</url>
-          <line>525</line>
-          <option name="timeStamp" value="117" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/client/client-conn.go</url>
-          <line>530</line>
-          <option name="timeStamp" value="118" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/client/client-conn.go</url>
-          <line>513</line>
-          <option name="timeStamp" value="119" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/client/client-conn.go</url>
-          <line>511</line>
-          <option name="timeStamp" value="120" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/client/client-conn.go</url>
-          <line>515</line>
-          <option name="timeStamp" value="121" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/client/client-conn.go</url>
-          <line>510</line>
-          <option name="timeStamp" value="123" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/tee-listeners/write-to.go</url>
-          <line>27</line>
-          <option name="timeStamp" value="124" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/tee-listeners/write-to.go</url>
-          <line>38</line>
-          <option name="timeStamp" value="125" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/common/multiListener.go</url>
-          <line>13</line>
-          <option name="timeStamp" value="126" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/tee-listeners/write-to.go</url>
-          <line>19</line>
-          <option name="timeStamp" value="127" />
-        </line-breakpoint>
-        <line-breakpoint type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/client/server-messages.go</url>
-          <line>48</line>
-          <option name="timeStamp" value="128" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/client/server-messages.go</url>
-          <line>92</line>
-          <option name="timeStamp" value="130" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/client/server-messages.go</url>
-          <line>76</line>
-          <option name="timeStamp" value="131" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/player/fbs-reader.go</url>
-          <line>142</line>
-          <option name="timeStamp" value="132" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/player/player_test.go</url>
-          <line>13</line>
-          <option name="timeStamp" value="133" />
-        </line-breakpoint>
-      </breakpoints>
       <breakpoints-dialog>
         <breakpoints-dialog />
       </breakpoints-dialog>
-      <option name="time" value="137" />
+      <option name="time" value="139" />
     </breakpoint-manager>
     <watches-manager>
       <configuration name="GoApplicationRunConfiguration">
@@ -1317,124 +1007,12 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/server/security.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/server/server.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/encodings/enc-corre.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="12" column="1" lean-forward="false" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/client/client-conn.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6750">
-          <caret line="450" column="0" lean-forward="false" selection-start-line="450" selection-start-column="0" selection-end-line="450" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/server/server-conn.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="765">
-          <caret line="51" column="4" lean-forward="false" selection-start-line="51" selection-start-column="4" selection-end-line="51" selection-end-column="4" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/client/server-messages.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="900">
-          <caret line="60" column="30" lean-forward="false" selection-start-line="60" selection-start-column="30" selection-end-line="60" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tee-listeners/recorder.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="21" column="27" lean-forward="true" selection-start-line="21" selection-start-column="27" selection-end-line="21" selection-end-column="27" />
-          <folding>
-            <marker date="1500387135000" expanded="true" signature="26:58" ph="..." />
-            <marker date="1500387135000" expanded="true" signature="5675:5870" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/common/readers.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="27" column="5" lean-forward="false" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/main.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="28" column="10" lean-forward="true" selection-start-line="28" selection-start-column="10" selection-end-line="28" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/go/1.8.3/libexec/src/net/net.go" />
-    <entry file="file://$PROJECT_DIR$/client/color.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/client/client_auth.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="19" column="31" lean-forward="false" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/client/client_test.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="10" column="19" lean-forward="false" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/server/security.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://C:/Go/src/runtime/asm_amd64.s" />
     <entry file="file://C:/Go/src/fmt/print.go" />
     <entry file="file://$PROJECT_DIR$/common/Logger.go" />
     <entry file="file://$PROJECT_DIR$/logger/logger.go" />
     <entry file="file://C:/Go/src/runtime/panic.go" />
-    <entry file="file://$PROJECT_DIR$/common/encoding.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="10" column="5" lean-forward="false" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/common/rectangle.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="17" lean-forward="true" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/encodings/enc-hextile.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1449,13 +1027,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/encodings/enc-tight.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/encodings/enc-tightpng.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1484,13 +1055,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/encodings/enc-copy-rect.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/encodings/enc-zrle.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1505,74 +1069,11 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/server/handlers.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="143">
-          <caret line="193" column="40" lean-forward="false" selection-start-line="193" selection-start-column="40" selection-end-line="193" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/server/client-messages.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-612">
-          <caret line="9" column="19" lean-forward="false" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/encodings/enc-pseudo.go" />
-    <entry file="file://$PROJECT_DIR$/common/readers.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1050">
-          <caret line="72" column="1" lean-forward="false" selection-start-line="72" selection-start-column="1" selection-end-line="72" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/client/server-messages.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="975">
-          <caret line="70" column="9" lean-forward="false" selection-start-line="70" selection-start-column="9" selection-end-line="70" selection-end-column="9" />
-          <folding>
-            <marker date="1500411004000" expanded="false" signature="23:76" ph="..." />
-            <marker date="1500411004000" expanded="true" signature="2450:2453" ph="{...}" />
-            <marker date="1500411004000" expanded="true" signature="2450:2502" ph="{...}" />
-            <marker date="1500411004000" expanded="true" signature="2822:2871" ph="{...}" />
-            <marker date="1500411004000" expanded="true" signature="3223:4045" ph="{...}" />
-            <marker date="1500411004000" expanded="true" signature="3324:3346" ph="{...}" />
-            <marker date="1500411004000" expanded="true" signature="3462:3484" ph="{...}" />
-            <marker date="1500411004000" expanded="true" signature="3689:4021" ph="{...}" />
-            <marker date="1500411004000" expanded="true" signature="3744:3788" ph="{...}" />
-            <marker date="1500411004000" expanded="true" signature="3817:3912" ph="{...}" />
-            <marker date="1500411004000" expanded="true" signature="4301:4314" ph="{...}" />
-            <marker date="1500411004000" expanded="true" signature="4657:4724" ph="{...}" />
-            <marker date="1500411004000" expanded="true" signature="4768:4781" ph="{...}" />
-            <marker date="1500411004000" expanded="true" signature="5117:5139" ph="{...}" />
-            <marker date="1500411004000" expanded="true" signature="5203:5225" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/tee-listeners/recorder.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="150">
           <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding>
-            <marker date="1500387135000" expanded="true" signature="26:58" ph="..." />
-            <marker date="1500387135000" expanded="true" signature="5675:5870" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/common/client-message.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="840">
-          <caret line="77" column="0" lean-forward="false" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/common/server-message.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="4" lean-forward="false" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
         </state>
       </provider>
     </entry>
@@ -1580,35 +1081,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="450">
           <caret line="34" column="12" lean-forward="false" selection-start-line="34" selection-start-column="12" selection-end-line="34" selection-end-column="12" />
-          <folding>
-            <marker date="1500088058000" expanded="false" signature="26:30" ph="..." />
-            <marker date="1500088058000" expanded="true" signature="189:257" ph="{...}" />
-            <marker date="1500088058000" expanded="true" signature="1040:1041" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/common/multiListener.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/server/server-conn.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2475">
-          <caret line="172" column="0" lean-forward="false" selection-start-line="172" selection-start-column="0" selection-end-line="172" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/server/server.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="645">
-          <caret line="49" column="0" lean-forward="false" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1616,38 +1088,17 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1590">
           <caret line="111" column="20" lean-forward="false" selection-start-line="111" selection-start-column="6" selection-end-line="111" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/server/ws-server-go.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="675">
-          <caret line="52" column="33" lean-forward="false" selection-start-line="52" selection-start-column="33" selection-end-line="52" selection-end-column="33" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/client/client-conn.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7305">
-          <caret line="496" column="8" lean-forward="false" selection-start-line="496" selection-start-column="8" selection-end-line="496" selection-end-column="8" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/proxy/proxy.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="180" column="0" lean-forward="true" selection-start-line="180" selection-start-column="0" selection-end-line="180" selection-end-column="0" />
+        <state relative-caret-position="2520">
+          <caret line="180" column="0" lean-forward="false" selection-start-line="180" selection-start-column="0" selection-end-line="180" selection-end-column="0" />
           <folding>
-            <element signature="n#!!block;n#createClientConnection#0" expanded="false" />
-            <element signature="n#!!block;n#getTargetServerFromSession#0" expanded="false" />
-            <element signature="n#!!block;n#newServerConnHandler#0" expanded="false" />
-            <element signature="n#!!block;n#StartListening#0" expanded="false" />
-            <marker date="1500386875000" expanded="false" signature="22:26" ph="..." />
-            <marker date="1500386875000" expanded="true" signature="5091:5092" ph="{...}" />
-            <marker date="1500386875000" expanded="true" signature="5091:5096" ph="{...}" />
+            <marker date="1500414972000" expanded="false" signature="22:26" ph="..." />
+            <marker date="1500414972000" expanded="true" signature="5096:5097" ph="{...}" />
+            <marker date="1500414972000" expanded="true" signature="5096:5101" ph="{...}" />
           </folding>
         </state>
       </provider>
@@ -1655,7 +1106,7 @@
     <entry file="file://$PROJECT_DIR$/proxy/proxy_test.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="315">
-          <caret line="21" column="5" lean-forward="true" selection-start-line="21" selection-start-column="5" selection-end-line="21" selection-end-column="5" />
+          <caret line="21" column="5" lean-forward="false" selection-start-line="21" selection-start-column="5" selection-end-line="21" selection-end-column="5" />
           <folding />
         </state>
       </provider>
@@ -1668,24 +1119,287 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/player/FBSPlayListener.go">
+    <entry file="file://$PROJECT_DIR$/player/FBSPlayListener.go" />
+    <entry file="file://$PROJECT_DIR$/player/player_test.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
+        <state relative-caret-position="375">
+          <caret line="33" column="0" lean-forward="false" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/player/player_test.go">
+    <entry file="file://$PROJECT_DIR$/encodings/enc-copy-rect.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="10" lean-forward="false" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/encodings/enc-cursor-pseudo.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="22" column="57" lean-forward="false" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="57" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/encodings/enc-tight.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="28" column="20" lean-forward="false" selection-start-line="28" selection-start-column="7" selection-end-line="28" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server/client-messages.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="46">
+          <caret line="237" column="7" lean-forward="false" selection-start-line="237" selection-start-column="7" selection-end-line="237" selection-end-column="7" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/rectangle.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="12" column="18" lean-forward="true" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/rfb-reader-helper.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="19" column="1" lean-forward="true" selection-start-line="19" selection-start-column="1" selection-end-line="19" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/client-message-type.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="76">
+          <caret line="32" column="0" lean-forward="true" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/LICENSE">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/conn-interfaces.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="291">
+          <caret line="20" column="19" lean-forward="false" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="19" />
           <folding>
-            <element signature="n#!!block;n#loadFbsFile#0" expanded="false" />
+            <element signature="e#16#27#0" expanded="true" />
+            <marker date="1500415709000" expanded="true" signature="522:614" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/common/if-encoding.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="32" column="25" lean-forward="true" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/client/color.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/client/client-conn.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="319">
+          <caret line="238" column="10" lean-forward="true" selection-start-line="238" selection-start-column="10" selection-end-line="238" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/client/client_auth.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="16" column="14" lean-forward="true" selection-start-line="16" selection-start-column="14" selection-end-line="16" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/client/client_auth_test.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/client/client_test.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="10" column="19" lean-forward="false" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/client/server-messages.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="678">
+          <caret line="60" column="32" lean-forward="true" selection-start-line="60" selection-start-column="32" selection-end-line="60" selection-end-column="32" />
+          <folding>
+            <marker date="1500415821000" expanded="true" signature="1158:3178" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="3052:3126" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="3052:3130" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="3052:3133" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="3180:3455" ph="/.../" />
+            <marker date="1500415821000" expanded="true" signature="3490:3539" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="3636:3831" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="3712:3747" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="3880:3994" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="4039:4052" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="4166:4984" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="4267:4289" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="4401:4423" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="4515:4537" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="4628:4960" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="4683:4727" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="4756:4851" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="4821:4847" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="4986:5085" ph="/.../" />
+            <marker date="1500415821000" expanded="true" signature="5186:5201" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="5236:5290" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="5321:5334" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="5430:5459" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="5575:5590" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="5632:5693" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="5731:5768" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="5881:6310" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="5964:5986" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="6069:6091" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="6176:6198" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="6270:6292" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="6312:6417" ph="/.../" />
+            <marker date="1500415821000" expanded="true" signature="6447:6463" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="6555:6745" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="6631:6661" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="6789:6852" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="6892:6905" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="7017:7398" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="7020:7089" ph="/.../" />
+            <marker date="1500415821000" expanded="true" signature="7164:7186" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="7237:7259" ph="{...}" />
+            <marker date="1500415821000" expanded="true" signature="7323:7345" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/server-message-type.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/multiListener.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/client/pointer.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="7" column="15" lean-forward="false" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/client/pixel-format.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server/server.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-975">
+          <caret line="24" column="1" lean-forward="true" selection-start-line="24" selection-start-column="1" selection-end-line="24" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server/ws_test.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server/ws-server-go.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="111">
+          <caret line="15" column="10" lean-forward="true" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server/server-conn.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="466">
+          <caret line="214" column="5" lean-forward="true" selection-start-line="214" selection-start-column="5" selection-end-line="214" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server/security.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1006">
+          <caret line="82" column="0" lean-forward="true" selection-start-line="82" selection-start-column="0" selection-end-line="82" selection-end-column="0" />
+          <folding>
+            <element signature="e#16#100#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server/server_test.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="36" column="27" lean-forward="true" selection-start-line="36" selection-start-column="27" selection-end-line="36" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server/handlers.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="71" column="18" lean-forward="true" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/client/client-conn.go b/client/client-conn.go
index 76f6330..1439450 100644
--- a/client/client-conn.go
+++ b/client/client-conn.go
@@ -27,7 +27,7 @@ type ClientAuth interface {
 type ClientConn struct {
 	conn io.ReadWriteCloser
 
-	//c      net.ServerConn
+	//c      net.IServerConn
 	config *ClientConfig
 
 	// If the pixel format uses a color map, then this is the color
@@ -37,7 +37,7 @@ type ClientConn struct {
 
 	// Encodings supported by the client. This should not be modified
 	// directly. Instead, SetEncodings should be used.
-	Encs []common.Encoding
+	Encs []common.IEncoding
 
 	// Width of the frame buffer in pixels, sent from the server.
 	FrameBufferWidth uint16
@@ -100,7 +100,7 @@ func (c *ClientConn) Close() error {
 	return c.conn.Close()
 }
 
-func (c *ClientConn) Encodings() []common.Encoding {
+func (c *ClientConn) Encodings() []common.IEncoding {
 	return c.Encs
 }
 
@@ -258,7 +258,7 @@ func (c *ClientConn) PointerEvent(mask ButtonMask, x, y uint16) error {
 // given should not be modified.
 //
 // See RFC 6143 Section 7.5.2
-func (c *ClientConn) SetEncodings(encs []common.Encoding) error {
+func (c *ClientConn) SetEncodings(encs []common.IEncoding) error {
 	data := make([]interface{}, 3+len(encs))
 	data[0] = uint8(2)
 	data[1] = uint8(0)
@@ -470,10 +470,10 @@ func (c *ClientConn) mainLoop() {
 	typeMap := make(map[uint8]common.ServerMessage)
 
 	defaultMessages := []common.ServerMessage{
-		new(FramebufferUpdateMessage),
-		new(SetColorMapEntriesMessage),
-		new(BellMessage),
-		new(ServerCutTextMessage),
+		new(MsgFramebufferUpdate),
+		new(MsgSetColorMapEntries),
+		new(MsgBell),
+		new(MsgServerCutText),
 	}
 
 	for _, msg := range defaultMessages {
diff --git a/client/client_auth_test.go b/client/client_auth_test.go
index 1858400..9982db9 100644
--- a/client/client_auth_test.go
+++ b/client/client_auth_test.go
@@ -1,18 +1,18 @@
 package client
 
 import (
-	"testing"
-	"net"
-	"time"
 	"bytes"
+	"net"
+	"testing"
+	"time"
 )
 
 type fakeNetConnection struct {
 	DataToSend []byte
-	Test *testing.T
+	Test       *testing.T
 	ExpectData []byte
-	Finished bool
-	Matched bool
+	Finished   bool
+	Matched    bool
 }
 
 func (fc fakeNetConnection) Read(b []byte) (n int, err error) {
@@ -32,12 +32,12 @@ func (fc *fakeNetConnection) Write(b []byte) (n int, err error) {
 	return len(b), nil
 }
 
-func (fc *fakeNetConnection) Close() error { return nil; }
-func (fc *fakeNetConnection) LocalAddr() net.Addr { return nil; }
-func (fc *fakeNetConnection) RemoteAddr() net.Addr { return nil; }
-func (fc *fakeNetConnection) SetDeadline(t time.Time) error { return nil; }
-func (fc *fakeNetConnection) SetReadDeadline(t time.Time) error { return nil; }
-func (fc *fakeNetConnection) SetWriteDeadline(t time.Time) error { return nil; }
+func (fc *fakeNetConnection) Close() error                       { return nil }
+func (fc *fakeNetConnection) LocalAddr() net.Addr                { return nil }
+func (fc *fakeNetConnection) RemoteAddr() net.Addr               { return nil }
+func (fc *fakeNetConnection) SetDeadline(t time.Time) error      { return nil }
+func (fc *fakeNetConnection) SetReadDeadline(t time.Time) error  { return nil }
+func (fc *fakeNetConnection) SetWriteDeadline(t time.Time) error { return nil }
 
 func TestClientAuthNone_Impl(t *testing.T) {
 	var raw interface{}
@@ -97,7 +97,7 @@ func TestClientAuthPasswordSuccess_Impl(t *testing.T) {
 	conn := &fakeNetConnection{DataToSend: randomValue, ExpectData: expectedResponse, Test: t}
 	err := raw.Handshake(conn)
 
-	if (err != nil) {
+	if err != nil {
 		t.Fatal(err)
 	}
 
@@ -155,7 +155,7 @@ func TestClientAuthPasswordReject_Impl(t *testing.T) {
 	conn := &fakeNetConnection{DataToSend: randomValue, ExpectData: expectedResponse, Test: t}
 	err := raw.Handshake(conn)
 
-	if (err != nil) {
+	if err != nil {
 		t.Fatal(err)
 	}
 
@@ -166,4 +166,4 @@ func TestClientAuthPasswordReject_Impl(t *testing.T) {
 	if !conn.Finished {
 		t.Fatal("PasswordAuth didn't complete properly")
 	}
-}
\ No newline at end of file
+}
diff --git a/client/color.go b/client/color.go
deleted file mode 100644
index a95dc89..0000000
--- a/client/color.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package client
-
-// Color represents a single color in a color map.
-type Color struct {
-	R, G, B uint16
-}
diff --git a/client/server-messages.go b/client/server-messages.go
index 07a801f..03c841f 100644
--- a/client/server-messages.go
+++ b/client/server-messages.go
@@ -12,14 +12,14 @@ import (
 	listeners "vncproxy/tee-listeners"
 )
 
-// FramebufferUpdateMessage consists of a sequence of rectangles of
+// MsgFramebufferUpdate consists of a sequence of rectangles of
 // pixel data that the client should put into its framebuffer.
-type FramebufferUpdateMessage struct {
+type MsgFramebufferUpdate struct {
 	Rectangles []common.Rectangle
 }
 
-func (m *FramebufferUpdateMessage) String() string {
-	str := fmt.Sprintf("FramebufferUpdateMessage (type=%d) Rects: ", m.Type())
+func (m *MsgFramebufferUpdate) String() string {
+	str := fmt.Sprintf("MsgFramebufferUpdate (type=%d) Rects: ", m.Type())
 	for _, rect := range m.Rectangles {
 		str += rect.String() + "\n"
 		//if this is the last rect, break the loop
@@ -30,19 +30,19 @@ func (m *FramebufferUpdateMessage) String() string {
 	return str
 }
 
-func (*FramebufferUpdateMessage) Type() uint8 {
+func (*MsgFramebufferUpdate) Type() uint8 {
 	return 0
 }
 
-func (fbm *FramebufferUpdateMessage) CopyTo(r io.Reader, w io.Writer, c common.IClientConn) error {
+func (fbm *MsgFramebufferUpdate) CopyTo(r io.Reader, w io.Writer, c common.IClientConn) error {
 	reader := common.NewRfbReadHelper(r)
-	writeTo := &listeners.WriteTo{w, "FramebufferUpdateMessage.CopyTo"}
+	writeTo := &listeners.WriteTo{w, "MsgFramebufferUpdate.CopyTo"}
 	reader.Listeners.AddListener(writeTo)
 	_, err := fbm.Read(c, reader)
 	return err
 }
 
-func (fbm *FramebufferUpdateMessage) Read(c common.IClientConn, r *common.RfbReadHelper) (common.ServerMessage, error) {
+func (fbm *MsgFramebufferUpdate) Read(c common.IClientConn, r *common.RfbReadHelper) (common.ServerMessage, error) {
 
 	// Read off the padding
 	var padding [1]byte
@@ -56,7 +56,7 @@ func (fbm *FramebufferUpdateMessage) Read(c common.IClientConn, r *common.RfbRea
 	}
 
 	// Build the map of encodings supported
-	encMap := make(map[int32]common.Encoding)
+	encMap := make(map[int32]common.IEncoding)
 	for _, enc := range c.Encodings() {
 		encMap[enc.Type()] = enc
 	}
@@ -64,11 +64,11 @@ func (fbm *FramebufferUpdateMessage) Read(c common.IClientConn, r *common.RfbRea
 	// We must always support the raw encoding
 	rawEnc := new(encodings.RawEncoding)
 	encMap[rawEnc.Type()] = rawEnc
-	logger.Infof("FrameBufferUpdateMessage.Read: numrects= %d", numRects)
+	logger.Infof("MsgFramebufferUpdate.Read: numrects= %d", numRects)
 
 	rects := make([]common.Rectangle, numRects)
 	for i := uint16(0); i < numRects; i++ {
-		logger.Debugf("FrameBufferUpdateMessage.Read: ###############rect################: %d", i)
+		logger.Debugf("MsgFramebufferUpdate.Read: ###############rect################: %d", i)
 
 		var encodingTypeInt int32
 		r.SendRectSeparator(-1)
@@ -91,7 +91,7 @@ func (fbm *FramebufferUpdateMessage) Read(c common.IClientConn, r *common.RfbRea
 
 		encType := common.EncodingType(encodingTypeInt)
 
-		logger.Infof("FrameBufferUpdateMessage.Read: rect# %d, rect hdr data: enctype=%s, data: %s", i, encType, string(jBytes))
+		logger.Infof("MsgFramebufferUpdate.Read: rect# %d, rect hdr data: enctype=%s, data: %s", i, encType, string(jBytes))
 		enc, supported := encMap[encodingTypeInt]
 		if supported {
 			var err error
@@ -108,49 +108,49 @@ func (fbm *FramebufferUpdateMessage) Read(c common.IClientConn, r *common.RfbRea
 					break
 				}
 			} else {
-				logger.Errorf("FrameBufferUpdateMessage.Read: unsupported encoding type: %d, %s", encodingTypeInt, encType)
-				return nil, fmt.Errorf("FrameBufferUpdateMessage.Read: unsupported encoding type: %d, %s", encodingTypeInt, encType)
+				logger.Errorf("MsgFramebufferUpdate.Read: unsupported encoding type: %d, %s", encodingTypeInt, encType)
+				return nil, fmt.Errorf("MsgFramebufferUpdate.Read: unsupported encoding type: %d, %s", encodingTypeInt, encType)
 			}
 		}
 	}
 
-	return &FramebufferUpdateMessage{rects}, nil
+	return &MsgFramebufferUpdate{rects}, nil
 }
 
-// SetColorMapEntriesMessage is sent by the server to set values into
+// MsgSetColorMapEntries is sent by the server to set values into
 // the color map. This message will automatically update the color map
 // for the associated connection, but contains the color change data
 // if the consumer wants to read it.
 //
 // See RFC 6143 Section 7.6.2
-type SetColorMapEntriesMessage struct {
+type MsgSetColorMapEntries struct {
 	FirstColor uint16
 	Colors     []common.Color
 }
 
-func (fbm *SetColorMapEntriesMessage) CopyTo(r io.Reader, w io.Writer, c common.IClientConn) error {
+func (fbm *MsgSetColorMapEntries) CopyTo(r io.Reader, w io.Writer, c common.IClientConn) error {
 	reader := &common.RfbReadHelper{Reader: r}
-	writeTo := &listeners.WriteTo{w, "SetColorMapEntriesMessage.CopyTo"}
+	writeTo := &listeners.WriteTo{w, "MsgSetColorMapEntries.CopyTo"}
 	reader.Listeners.AddListener(writeTo)
 	_, err := fbm.Read(c, reader)
 	return err
 }
-func (m *SetColorMapEntriesMessage) String() string {
-	return fmt.Sprintf("SetColorMapEntriesMessage (type=%d) first:%d colors: %v: ", m.Type(), m.FirstColor, m.Colors)
+func (m *MsgSetColorMapEntries) String() string {
+	return fmt.Sprintf("MsgSetColorMapEntries (type=%d) first:%d colors: %v: ", m.Type(), m.FirstColor, m.Colors)
 }
 
-func (*SetColorMapEntriesMessage) Type() uint8 {
+func (*MsgSetColorMapEntries) Type() uint8 {
 	return 1
 }
 
-func (*SetColorMapEntriesMessage) Read(c common.IClientConn, r *common.RfbReadHelper) (common.ServerMessage, error) {
+func (*MsgSetColorMapEntries) Read(c common.IClientConn, r *common.RfbReadHelper) (common.ServerMessage, error) {
 	// Read off the padding
 	var padding [1]byte
 	if _, err := io.ReadFull(r, padding[:]); err != nil {
 		return nil, err
 	}
 
-	var result SetColorMapEntriesMessage
+	var result MsgSetColorMapEntries
 	if err := binary.Read(r, binary.BigEndian, &result.FirstColor); err != nil {
 		return nil, err
 	}
@@ -186,37 +186,37 @@ func (*SetColorMapEntriesMessage) Read(c common.IClientConn, r *common.RfbReadHe
 // Bell signals that an audible bell should be made on the client.
 //
 // See RFC 6143 Section 7.6.3
-type BellMessage byte
+type MsgBell byte
 
-func (fbm *BellMessage) CopyTo(r io.Reader, w io.Writer, c common.IClientConn) error {
+func (fbm *MsgBell) CopyTo(r io.Reader, w io.Writer, c common.IClientConn) error {
 	return nil
 }
-func (m *BellMessage) String() string {
-	return fmt.Sprintf("BellMessage (type=%d)", m.Type())
+func (m *MsgBell) String() string {
+	return fmt.Sprintf("MsgBell (type=%d)", m.Type())
 }
 
-func (*BellMessage) Type() uint8 {
+func (*MsgBell) Type() uint8 {
 	return 2
 }
 
-func (*BellMessage) Read(common.IClientConn, *common.RfbReadHelper) (common.ServerMessage, error) {
-	return new(BellMessage), nil
+func (*MsgBell) Read(common.IClientConn, *common.RfbReadHelper) (common.ServerMessage, error) {
+	return new(MsgBell), nil
 }
 
-type ServerFenceMessage byte
+type MsgServerFence byte
 
-func (fbm *ServerFenceMessage) CopyTo(r io.Reader, w io.Writer, c common.IClientConn) error {
+func (fbm *MsgServerFence) CopyTo(r io.Reader, w io.Writer, c common.IClientConn) error {
 	return nil
 }
-func (m *ServerFenceMessage) String() string {
-	return fmt.Sprintf("ServerFenceMessage (type=%d)", m.Type())
+func (m *MsgServerFence) String() string {
+	return fmt.Sprintf("MsgServerFence (type=%d)", m.Type())
 }
 
-func (*ServerFenceMessage) Type() uint8 {
+func (*MsgServerFence) Type() uint8 {
 	return uint8(common.ServerFence)
 }
 
-func (sf *ServerFenceMessage) Read(info common.IClientConn, c *common.RfbReadHelper) (common.ServerMessage, error) {
+func (sf *MsgServerFence) Read(info common.IClientConn, c *common.RfbReadHelper) (common.ServerMessage, error) {
 	bytes := make([]byte, 3)
 	c.Read(bytes)
 	if _, err := c.Read(bytes); err != nil {
@@ -239,29 +239,29 @@ func (sf *ServerFenceMessage) Read(info common.IClientConn, c *common.RfbReadHel
 	return sf, nil
 }
 
-// ServerCutTextMessage indicates the server has new text in the cut buffer.
+// MsgServerCutText indicates the server has new text in the cut buffer.
 //
 // See RFC 6143 Section 7.6.4
-type ServerCutTextMessage struct {
+type MsgServerCutText struct {
 	Text string
 }
 
-func (fbm *ServerCutTextMessage) CopyTo(r io.Reader, w io.Writer, c common.IClientConn) error {
+func (fbm *MsgServerCutText) CopyTo(r io.Reader, w io.Writer, c common.IClientConn) error {
 	reader := &common.RfbReadHelper{Reader: r}
-	writeTo := &listeners.WriteTo{w, "ServerCutTextMessage.CopyTo"}
+	writeTo := &listeners.WriteTo{w, "MsgServerCutText.CopyTo"}
 	reader.Listeners.AddListener(writeTo)
 	_, err := fbm.Read(c, reader)
 	return err
 }
-func (m *ServerCutTextMessage) String() string {
-	return fmt.Sprintf("ServerCutTextMessage (type=%d)", m.Type())
+func (m *MsgServerCutText) String() string {
+	return fmt.Sprintf("MsgServerCutText (type=%d)", m.Type())
 }
 
-func (*ServerCutTextMessage) Type() uint8 {
+func (*MsgServerCutText) Type() uint8 {
 	return 3
 }
 
-func (*ServerCutTextMessage) Read(conn common.IClientConn, r *common.RfbReadHelper) (common.ServerMessage, error) {
+func (*MsgServerCutText) Read(conn common.IClientConn, r *common.RfbReadHelper) (common.ServerMessage, error) {
 	//reader := common.RfbReadHelper{Reader: r}
 
 	// Read off the padding
@@ -278,5 +278,5 @@ func (*ServerCutTextMessage) Read(conn common.IClientConn, r *common.RfbReadHelp
 		return nil, err
 	}
 
-	return &ServerCutTextMessage{string(textBytes)}, nil
+	return &MsgServerCutText{string(textBytes)}, nil
 }
diff --git a/common/client-message.go b/common/client-message-type.go
similarity index 70%
rename from common/client-message.go
rename to common/client-message-type.go
index 8e6ad8a..fe45636 100644
--- a/common/client-message.go
+++ b/common/client-message-type.go
@@ -30,27 +30,6 @@ type Color struct {
 
 type ColorMap [256]Color
 
-type ServerConn interface {
-	io.ReadWriter
-	//ServerConn() io.ReadWriter
-	Protocol() string
-	CurrentPixelFormat() *PixelFormat
-	SetPixelFormat(*PixelFormat) error
-	//ColorMap() *ColorMap
-	SetColorMap(*ColorMap)
-	Encodings() []Encoding
-	SetEncodings([]EncodingType) error
-	Width() uint16
-	Height() uint16
-	SetWidth(uint16)
-	SetHeight(uint16)
-	DesktopName() string
-	SetDesktopName(string)
-	//Flush() error
-	SetProtoVersion(string)
-	// Write([]byte) (int, error)
-}
-
 // ClientMessage is the interface
 type ClientMessage interface {
 	Type() ClientMessageType
diff --git a/common/conn-interfaces.go b/common/conn-interfaces.go
new file mode 100644
index 0000000..a5eed93
--- /dev/null
+++ b/common/conn-interfaces.go
@@ -0,0 +1,30 @@
+package common
+
+import "io"
+
+type IServerConn interface {
+	io.ReadWriter
+	//IServerConn() io.ReadWriter
+	Protocol() string
+	CurrentPixelFormat() *PixelFormat
+	SetPixelFormat(*PixelFormat) error
+	//ColorMap() *ColorMap
+	SetColorMap(*ColorMap)
+	Encodings() []IEncoding
+	SetEncodings([]EncodingType) error
+	Width() uint16
+	Height() uint16
+	SetWidth(uint16)
+	SetHeight(uint16)
+	DesktopName() string
+	SetDesktopName(string)
+	//Flush() error
+	SetProtoVersion(string)
+	// Write([]byte) (int, error)
+}
+
+type IClientConn interface {
+	CurrentPixelFormat() *PixelFormat
+	CurrentColorMap() *ColorMap
+	Encodings() []IEncoding
+}
diff --git a/common/encoding.go b/common/encoding.go
index 7763c81..2fb6d96 100644
--- a/common/encoding.go
+++ b/common/encoding.go
@@ -6,16 +6,16 @@ import (
 	"io"
 )
 
-// An Encoding implements a method for encoding pixel data that is
+// An IEncoding implements a method for encoding pixel data that is
 // sent by the server to the client.
-type Encoding interface {
+type IEncoding interface {
 	// The number that uniquely identifies this encoding type.
 	Type() int32
 	WriteTo(w io.Writer) (n int, err error)
 	// Read reads the contents of the encoded pixel data from the reader.
-	// This should return a new Encoding implementation that contains
+	// This should return a new IEncoding implementation that contains
 	// the proper data.
-	Read(*PixelFormat, *Rectangle, *RfbReadHelper) (Encoding, error)
+	Read(*PixelFormat, *Rectangle, *RfbReadHelper) (IEncoding, error)
 }
 
 // EncodingType represents a known VNC encoding type.
diff --git a/common/multiListener.go b/common/multi-listener.go
similarity index 100%
rename from common/multiListener.go
rename to common/multi-listener.go
diff --git a/common/rectangle.go b/common/rectangle.go
index 75688a7..b3e46e6 100644
--- a/common/rectangle.go
+++ b/common/rectangle.go
@@ -1,18 +1,18 @@
-package common
-
-import (
-	"fmt"
-)
-
-// Rectangle represents a rectangle of pixel data.
-type Rectangle struct {
-	X      uint16
-	Y      uint16
-	Width  uint16
-	Height uint16
-	Enc    Encoding
-}
-
-func (r *Rectangle) String() string {
-	return fmt.Sprintf("(%d,%d) (width: %d, height: %d), Enc= %d", r.X, r.Y, r.Width, r.Height, r.Enc.Type())
-}
+package common
+
+import (
+	"fmt"
+)
+
+// Rectangle represents a rectangle of pixel data.
+type Rectangle struct {
+	X      uint16
+	Y      uint16
+	Width  uint16
+	Height uint16
+	Enc    IEncoding
+}
+
+func (r *Rectangle) String() string {
+	return fmt.Sprintf("(%d,%d) (width: %d, height: %d), Enc= %d", r.X, r.Y, r.Width, r.Height, r.Enc.Type())
+}
diff --git a/common/readers.go b/common/rfb-reader-helper.go
similarity index 100%
rename from common/readers.go
rename to common/rfb-reader-helper.go
diff --git a/common/server-message.go b/common/server-message-type.go
similarity index 86%
rename from common/server-message.go
rename to common/server-message-type.go
index 6445bab..cfd7751 100644
--- a/common/server-message.go
+++ b/common/server-message-type.go
@@ -4,12 +4,6 @@ import (
 	"io"
 )
 
-type IClientConn interface {
-	CurrentPixelFormat() *PixelFormat
-	CurrentColorMap() *ColorMap
-	Encodings() []Encoding
-}
-
 type ServerMessage interface {
 	Type() uint8
 	String() string
diff --git a/encodings/enc-copy-rect.go b/encodings/enc-copy-rect.go
index d812f7d..8a6e6bf 100644
--- a/encodings/enc-copy-rect.go
+++ b/encodings/enc-copy-rect.go
@@ -27,7 +27,7 @@ func (z *CopyRectEncoding) WriteTo(w io.Writer) (n int, err error) {
 	return 4, nil
 }
 
-func (z *CopyRectEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.Encoding, error) {
+func (z *CopyRectEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.IEncoding, error) {
 	z.copyRectSrcX, _ = r.ReadUint16()
 	z.copyRectSrcY, _ = r.ReadUint16()
 	return z, nil
diff --git a/encodings/enc-corre.go b/encodings/enc-corre.go
index 680601e..5ab5831 100644
--- a/encodings/enc-corre.go
+++ b/encodings/enc-corre.go
@@ -36,7 +36,7 @@ func (z *CoRREEncoding) WriteTo(w io.Writer) (n int, err error) {
 	return b, nil
 }
 
-func (z *CoRREEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.Encoding, error) {
+func (z *CoRREEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.IEncoding, error) {
 	bytesPerPixel := int(pixelFmt.BPP / 8)
 	numOfSubrectangles, err := r.ReadUint32()
 	if err != nil {
diff --git a/encodings/enc-cursor-pseudo.go b/encodings/enc-cursor-pseudo.go
index 0a79e4b..74bed99 100644
--- a/encodings/enc-cursor-pseudo.go
+++ b/encodings/enc-cursor-pseudo.go
@@ -15,7 +15,7 @@ func (pe *EncCursorPseudo) Type() int32 {
 func (z *EncCursorPseudo) WriteTo(w io.Writer) (n int, err error) {
 	return 0, nil
 }
-func (pe *EncCursorPseudo) Read(pf *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.Encoding, error) {
+func (pe *EncCursorPseudo) Read(pf *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.IEncoding, error) {
 	if rect.Width*rect.Height == 0 {
 		return pe, nil
 	}
diff --git a/encodings/enc-hextile.go b/encodings/enc-hextile.go
index cb3795e..3f56a21 100644
--- a/encodings/enc-hextile.go
+++ b/encodings/enc-hextile.go
@@ -1,84 +1,84 @@
-package encodings
-
-import (
-	"io"
-	"vncproxy/common"
-	"vncproxy/logger"
-)
-
-const (
-	HextileRaw                 = 1
-	HextileBackgroundSpecified = 2
-	HextileForegroundSpecified = 4
-	HextileAnySubrects         = 8
-	HextileSubrectsColoured    = 16
-)
-
-type HextileEncoding struct {
-	//Colors []Color
-	bytes []byte
-}
-
-func (z *HextileEncoding) Type() int32 {
-	return 5
-}
-func (z *HextileEncoding) WriteTo(w io.Writer) (n int, err error) {
-	return w.Write(z.bytes)
-}
-func (z *HextileEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.Encoding, error) {
-	bytesPerPixel := int(pixelFmt.BPP) / 8
-
-	r.StartByteCollection()
-	defer func() {
-		z.bytes = r.EndByteCollection()
-	}()
-
-	for ty := rect.Y; ty < rect.Y+rect.Height; ty += 16 {
-		th := 16
-		if rect.Y+rect.Height-ty < 16 {
-			th = int(rect.Y) + int(rect.Height) - int(ty)
-		}
-
-		for tx := rect.X; tx < rect.X+rect.Width; tx += 16 {
-			tw := 16
-			if rect.X+rect.Width-tx < 16 {
-				tw = int(rect.X) + int(rect.Width) - int(tx)
-			}
-
-			//handle Hextile Subrect(tx, ty, tw, th):
-			subencoding, err := r.ReadUint8()
-		
-			if err != nil {
-				logger.Errorf("HextileEncoding.Read: error in hextile reader: %v", err)
-				return nil, err
-			}
-
-			if (subencoding & HextileRaw) != 0 {
-				r.ReadBytes(tw * th * bytesPerPixel)
-				continue
-			}
-			if (subencoding & HextileBackgroundSpecified) != 0 {
-				r.ReadBytes(int(bytesPerPixel))
-			}
-			if (subencoding & HextileForegroundSpecified) != 0 {
-				r.ReadBytes(int(bytesPerPixel))
-			}
-			if (subencoding & HextileAnySubrects) == 0 {
-				//logger.Debug("hextile reader: no Subrects")
-				continue
-			}
-
-			nSubrects, err := r.ReadUint8()
-			if err != nil {
-				return nil, err
-			}
-			bufsize := int(nSubrects) * 2
-			if (subencoding & HextileSubrectsColoured) != 0 {
-				bufsize += int(nSubrects) * int(bytesPerPixel)
-			}
-			r.ReadBytes(bufsize)
-		}
-	}
-
-	return z, nil
-}
+package encodings
+
+import (
+	"io"
+	"vncproxy/common"
+	"vncproxy/logger"
+)
+
+const (
+	HextileRaw                 = 1
+	HextileBackgroundSpecified = 2
+	HextileForegroundSpecified = 4
+	HextileAnySubrects         = 8
+	HextileSubrectsColoured    = 16
+)
+
+type HextileEncoding struct {
+	//Colors []Color
+	bytes []byte
+}
+
+func (z *HextileEncoding) Type() int32 {
+	return 5
+}
+func (z *HextileEncoding) WriteTo(w io.Writer) (n int, err error) {
+	return w.Write(z.bytes)
+}
+func (z *HextileEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.IEncoding, error) {
+	bytesPerPixel := int(pixelFmt.BPP) / 8
+
+	r.StartByteCollection()
+	defer func() {
+		z.bytes = r.EndByteCollection()
+	}()
+
+	for ty := rect.Y; ty < rect.Y+rect.Height; ty += 16 {
+		th := 16
+		if rect.Y+rect.Height-ty < 16 {
+			th = int(rect.Y) + int(rect.Height) - int(ty)
+		}
+
+		for tx := rect.X; tx < rect.X+rect.Width; tx += 16 {
+			tw := 16
+			if rect.X+rect.Width-tx < 16 {
+				tw = int(rect.X) + int(rect.Width) - int(tx)
+			}
+
+			//handle Hextile Subrect(tx, ty, tw, th):
+			subencoding, err := r.ReadUint8()
+
+			if err != nil {
+				logger.Errorf("HextileEncoding.Read: error in hextile reader: %v", err)
+				return nil, err
+			}
+
+			if (subencoding & HextileRaw) != 0 {
+				r.ReadBytes(tw * th * bytesPerPixel)
+				continue
+			}
+			if (subencoding & HextileBackgroundSpecified) != 0 {
+				r.ReadBytes(int(bytesPerPixel))
+			}
+			if (subencoding & HextileForegroundSpecified) != 0 {
+				r.ReadBytes(int(bytesPerPixel))
+			}
+			if (subencoding & HextileAnySubrects) == 0 {
+				//logger.Debug("hextile reader: no Subrects")
+				continue
+			}
+
+			nSubrects, err := r.ReadUint8()
+			if err != nil {
+				return nil, err
+			}
+			bufsize := int(nSubrects) * 2
+			if (subencoding & HextileSubrectsColoured) != 0 {
+				bufsize += int(nSubrects) * int(bytesPerPixel)
+			}
+			r.ReadBytes(bufsize)
+		}
+	}
+
+	return z, nil
+}
diff --git a/encodings/enc-pseudo.go b/encodings/enc-pseudo.go
index eaa873a..128ccc9 100644
--- a/encodings/enc-pseudo.go
+++ b/encodings/enc-pseudo.go
@@ -15,6 +15,6 @@ func (pe *PseudoEncoding) Type() int32 {
 func (z *PseudoEncoding) WriteTo(w io.Writer) (n int, err error) {
 	return 0, nil
 }
-func (pe *PseudoEncoding) Read(*common.PixelFormat, *common.Rectangle, *common.RfbReadHelper) (common.Encoding, error) {
+func (pe *PseudoEncoding) Read(*common.PixelFormat, *common.Rectangle, *common.RfbReadHelper) (common.IEncoding, error) {
 	return pe, nil
 }
diff --git a/encodings/enc-raw.go b/encodings/enc-raw.go
index 31ab6ca..41fc8e7 100644
--- a/encodings/enc-raw.go
+++ b/encodings/enc-raw.go
@@ -17,7 +17,7 @@ func (*RawEncoding) Type() int32 {
 func (z *RawEncoding) WriteTo(w io.Writer) (n int, err error) {
 	return w.Write(z.bytes)
 }
-func (*RawEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.Encoding, error) {
+func (*RawEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.IEncoding, error) {
 
 	bytesPerPixel := int(pixelFmt.BPP / 8)
 
diff --git a/encodings/enc-rre.go b/encodings/enc-rre.go
index 6acebae..e1f3c86 100644
--- a/encodings/enc-rre.go
+++ b/encodings/enc-rre.go
@@ -1,59 +1,59 @@
-package encodings
-
-import (
-	"encoding/binary"
-	"io"
-	"vncproxy/common"
-)
-
-type RREEncoding struct {
-	//Colors []Color
-	numSubRects     uint32
-	backgroundColor []byte
-	subRectData     []byte
-}
-
-func (z *RREEncoding) WriteTo(w io.Writer) (n int, err error) {
-	binary.Write(w, binary.BigEndian, z.numSubRects)
-	if err != nil {
-		return 0, err
-	}
-
-	w.Write(z.backgroundColor)
-	if err != nil {
-		return 0, err
-	}
-
-	w.Write(z.subRectData)
-
-	if err != nil {
-		return 0, err
-	}
-	b := len(z.backgroundColor) + len(z.subRectData) + 4
-	return b, nil
-}
-
-func (z *RREEncoding) Type() int32 {
-	return 2
-}
-func (z *RREEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.Encoding, error) {
-	bytesPerPixel := int(pixelFmt.BPP / 8)
-	numOfSubrectangles, err := r.ReadUint32()
-	if err != nil {
-		return nil, err
-	}
-	z.numSubRects = numOfSubrectangles
-
-	//read whole-rect background color
-	z.backgroundColor, err = r.ReadBytes(bytesPerPixel)
-	if err != nil {
-		return nil, err
-	}
-
-	//read all individual rects (color=bytesPerPixel + x=16b + y=16b + w=16b + h=16b)
-	z.subRectData, err = r.ReadBytes(int(numOfSubrectangles) * (bytesPerPixel + 8)) // x+y+w+h=8 bytes
-	if err != nil {
-		return nil, err
-	}
-	return z, nil
-}
+package encodings
+
+import (
+	"encoding/binary"
+	"io"
+	"vncproxy/common"
+)
+
+type RREEncoding struct {
+	//Colors []Color
+	numSubRects     uint32
+	backgroundColor []byte
+	subRectData     []byte
+}
+
+func (z *RREEncoding) WriteTo(w io.Writer) (n int, err error) {
+	binary.Write(w, binary.BigEndian, z.numSubRects)
+	if err != nil {
+		return 0, err
+	}
+
+	w.Write(z.backgroundColor)
+	if err != nil {
+		return 0, err
+	}
+
+	w.Write(z.subRectData)
+
+	if err != nil {
+		return 0, err
+	}
+	b := len(z.backgroundColor) + len(z.subRectData) + 4
+	return b, nil
+}
+
+func (z *RREEncoding) Type() int32 {
+	return 2
+}
+func (z *RREEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.IEncoding, error) {
+	bytesPerPixel := int(pixelFmt.BPP / 8)
+	numOfSubrectangles, err := r.ReadUint32()
+	if err != nil {
+		return nil, err
+	}
+	z.numSubRects = numOfSubrectangles
+
+	//read whole-rect background color
+	z.backgroundColor, err = r.ReadBytes(bytesPerPixel)
+	if err != nil {
+		return nil, err
+	}
+
+	//read all individual rects (color=bytesPerPixel + x=16b + y=16b + w=16b + h=16b)
+	z.subRectData, err = r.ReadBytes(int(numOfSubrectangles) * (bytesPerPixel + 8)) // x+y+w+h=8 bytes
+	if err != nil {
+		return nil, err
+	}
+	return z, nil
+}
diff --git a/encodings/enc-tight.go b/encodings/enc-tight.go
index d7f39ba..02a1c79 100644
--- a/encodings/enc-tight.go
+++ b/encodings/enc-tight.go
@@ -25,7 +25,6 @@ type TightEncoding struct {
 	bytes []byte
 }
 
-
 func (*TightEncoding) Type() int32 { return int32(common.EncTight) }
 
 func calcTightBytePerPixel(pf *common.PixelFormat) int {
@@ -51,7 +50,7 @@ func StoreBytes(bytes *bytes.Buffer, data []byte) {
 	}
 }
 
-func (t *TightEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.Encoding, error) {
+func (t *TightEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.IEncoding, error) {
 	bytesPixel := calcTightBytePerPixel(pixelFmt)
 
 	r.StartByteCollection()
diff --git a/encodings/enc-tightpng.go b/encodings/enc-tightpng.go
index 4894114..68639fa 100644
--- a/encodings/enc-tightpng.go
+++ b/encodings/enc-tightpng.go
@@ -17,7 +17,7 @@ func (z *TightPngEncoding) WriteTo(w io.Writer) (n int, err error) {
 
 func (*TightPngEncoding) Type() int32 { return int32(common.EncTightPng) }
 
-func (t *TightPngEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.Encoding, error) {
+func (t *TightPngEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.IEncoding, error) {
 	bytesPixel := calcTightBytePerPixel(pixelFmt)
 	r.StartByteCollection()
 	defer func() {
diff --git a/encodings/enc-zlib.go b/encodings/enc-zlib.go
index e17ab7e..be27029 100644
--- a/encodings/enc-zlib.go
+++ b/encodings/enc-zlib.go
@@ -1,38 +1,38 @@
-package encodings
-
-import (
-	"bytes"
-	"encoding/binary"
-	"io"
-	"vncproxy/common"
-)
-
-type ZLibEncoding struct {
-	bytes []byte
-}
-
-func (z *ZLibEncoding) Type() int32 {
-	return 6
-}
-func (z *ZLibEncoding) WriteTo(w io.Writer) (n int, err error) {
-	return w.Write(z.bytes)
-}
-func (z *ZLibEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.Encoding, error) {
-	//conn := common.RfbReadHelper{Reader:r}
-	//conn := &DataSource{conn: conn.c, PixelFormat: conn.PixelFormat}
-	//bytesPerPixel := c.PixelFormat.BPP / 8
-	bytes := &bytes.Buffer{}
-	len, err := r.ReadUint32()
-	if err != nil {
-		return nil, err
-	}
-
-	binary.Write(bytes, binary.BigEndian, len)
-	bts, err := r.ReadBytes(int(len))
-	if err != nil {
-		return nil, err
-	}
-	StoreBytes(bytes, bts)
-	z.bytes = bytes.Bytes()
-	return z, nil
-}
+package encodings
+
+import (
+	"bytes"
+	"encoding/binary"
+	"io"
+	"vncproxy/common"
+)
+
+type ZLibEncoding struct {
+	bytes []byte
+}
+
+func (z *ZLibEncoding) Type() int32 {
+	return 6
+}
+func (z *ZLibEncoding) WriteTo(w io.Writer) (n int, err error) {
+	return w.Write(z.bytes)
+}
+func (z *ZLibEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.IEncoding, error) {
+	//conn := common.RfbReadHelper{Reader:r}
+	//conn := &DataSource{conn: conn.c, PixelFormat: conn.PixelFormat}
+	//bytesPerPixel := c.PixelFormat.BPP / 8
+	bytes := &bytes.Buffer{}
+	len, err := r.ReadUint32()
+	if err != nil {
+		return nil, err
+	}
+
+	binary.Write(bytes, binary.BigEndian, len)
+	bts, err := r.ReadBytes(int(len))
+	if err != nil {
+		return nil, err
+	}
+	StoreBytes(bytes, bts)
+	z.bytes = bytes.Bytes()
+	return z, nil
+}
diff --git a/encodings/enc-zrle.go b/encodings/enc-zrle.go
index 4c878c9..5f2eeb4 100644
--- a/encodings/enc-zrle.go
+++ b/encodings/enc-zrle.go
@@ -1,38 +1,38 @@
-package encodings
-
-import (
-	"bytes"
-	"encoding/binary"
-	"io"
-	"vncproxy/common"
-)
-
-type ZRLEEncoding struct {
-	bytes []byte
-}
-
-func (z *ZRLEEncoding) Type() int32 {
-	return 16
-}
-
-func (z *ZRLEEncoding) WriteTo(w io.Writer) (n int, err error) {
-	return w.Write(z.bytes)
-}
-
-func (z *ZRLEEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.Encoding, error) {
-
-	bytes := &bytes.Buffer{}
-	len, err := r.ReadUint32()
-	if err != nil {
-		return nil, err
-	}
-
-	binary.Write(bytes, binary.BigEndian, len)
-	bts, err := r.ReadBytes(int(len))
-	if err != nil {
-		return nil, err
-	}
-	StoreBytes(bytes, bts)
-	z.bytes = bytes.Bytes()
-	return z, nil
-}
+package encodings
+
+import (
+	"bytes"
+	"encoding/binary"
+	"io"
+	"vncproxy/common"
+)
+
+type ZRLEEncoding struct {
+	bytes []byte
+}
+
+func (z *ZRLEEncoding) Type() int32 {
+	return 16
+}
+
+func (z *ZRLEEncoding) WriteTo(w io.Writer) (n int, err error) {
+	return w.Write(z.bytes)
+}
+
+func (z *ZRLEEncoding) Read(pixelFmt *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.IEncoding, error) {
+
+	bytes := &bytes.Buffer{}
+	len, err := r.ReadUint32()
+	if err != nil {
+		return nil, err
+	}
+
+	binary.Write(bytes, binary.BigEndian, len)
+	bts, err := r.ReadBytes(int(len))
+	if err != nil {
+		return nil, err
+	}
+	StoreBytes(bytes, bts)
+	z.bytes = bytes.Bytes()
+	return z, nil
+}
diff --git a/main.go b/main.go
index 78063f6..c377bc4 100644
--- a/main.go
+++ b/main.go
@@ -47,7 +47,7 @@ func main() {
 	// if err != nil {
 	// 	logger.Errorf("error requesting fb update: %s", err)
 	// }
-	encs := []common.Encoding{
+	encs := []common.IEncoding{
 		&encodings.TightEncoding{},
 		//&encodings.TightPngEncoding{},
 		//rre := encodings.RREEncoding{},
diff --git a/player/fbs-play-listener.go b/player/fbs-play-listener.go
index fde7003..6aff804 100644
--- a/player/fbs-play-listener.go
+++ b/player/fbs-play-listener.go
@@ -21,12 +21,12 @@ type FBSPlayListener struct {
 
 func NewFBSPlayListener(conn *server.ServerConn, r *FbsReader) *FBSPlayListener {
 	h := &FBSPlayListener{Conn: conn, Fbs: r}
-	cm := client.BellMessage(0)
+	cm := client.MsgBell(0)
 	h.serverMessageMap = make(map[uint8]common.ServerMessage)
-	h.serverMessageMap[0] = &client.FramebufferUpdateMessage{}
-	h.serverMessageMap[1] = &client.SetColorMapEntriesMessage{}
+	h.serverMessageMap[0] = &client.MsgFramebufferUpdate{}
+	h.serverMessageMap[1] = &client.MsgSetColorMapEntries{}
 	h.serverMessageMap[2] = &cm
-	h.serverMessageMap[3] = &client.ServerCutTextMessage{}
+	h.serverMessageMap[3] = &client.MsgServerCutText{}
 
 	return h
 }
@@ -45,7 +45,7 @@ func (handler *FBSPlayListener) Consume(seg *common.RfbSegment) error {
 			}
 			handler.sendFbsMessage()
 		}
-		// server.FramebufferUpdateRequest:
+		// server.MsgFramebufferUpdateRequest:
 	}
 	return nil
 }
diff --git a/player/fbs-reader.go b/player/fbs-reader.go
index e75819c..148707f 100644
--- a/player/fbs-reader.go
+++ b/player/fbs-reader.go
@@ -15,12 +15,13 @@ type FbsReader struct {
 	buffer           bytes.Buffer
 	currentTimestamp int
 	pixelFormat      *common.PixelFormat
-	encodings        []common.Encoding
+	encodings        []common.IEncoding
 }
 
 func (fbs *FbsReader) Read(p []byte) (n int, err error) {
 	if fbs.buffer.Len() < len(p) {
 		seg, err := fbs.ReadSegment()
+
 		if err != nil {
 			logger.Error("FBSReader.Read: error reading FBSsegment: ", err)
 			return 0, err
@@ -33,7 +34,7 @@ func (fbs *FbsReader) Read(p []byte) (n int, err error) {
 
 func (fbs *FbsReader) CurrentPixelFormat() *common.PixelFormat { return fbs.pixelFormat }
 func (fbs *FbsReader) CurrentColorMap() *common.ColorMap       { return &common.ColorMap{} }
-func (fbs *FbsReader) Encodings() []common.Encoding            { return fbs.encodings }
+func (fbs *FbsReader) Encodings() []common.IEncoding           { return fbs.encodings }
 
 func NewFbsReader(fbsFile string) (*FbsReader, error) {
 
@@ -43,7 +44,7 @@ func NewFbsReader(fbsFile string) (*FbsReader, error) {
 		return nil, err
 	}
 	return &FbsReader{reader: reader,
-		encodings: []common.Encoding{
+		encodings: []common.IEncoding{
 			&encodings.CopyRectEncoding{},
 			&encodings.ZLibEncoding{},
 			&encodings.ZRLEEncoding{},
@@ -51,6 +52,7 @@ func NewFbsReader(fbsFile string) (*FbsReader, error) {
 			&encodings.HextileEncoding{},
 			&encodings.TightEncoding{},
 			&encodings.TightPngEncoding{},
+			&encodings.EncCursorPseudo{},
 			&encodings.RawEncoding{},
 			&encodings.RREEncoding{},
 		},
@@ -71,7 +73,7 @@ func (fbs *FbsReader) ReadStartSession() (*common.ServerInit, error) {
 	bytes := make([]byte, 12)
 	_, err := reader.Read(bytes)
 	if err != nil {
-		logger.Error("error reading rbs init message - FBS file Version:", err)
+		logger.Error("FbsReader.ReadStartSession: error reading rbs init message - FBS file Version:", err)
 		return nil, err
 	}
 
@@ -80,27 +82,27 @@ func (fbs *FbsReader) ReadStartSession() (*common.ServerInit, error) {
 	bytes = make([]byte, 12)
 	_, err = fbs.Read(bytes)
 	if err != nil {
-		logger.Error("error reading rbs init - RFB Version: ", err)
+		logger.Error("FbsReader.ReadStartSession: error reading rbs init - RFB Version: ", err)
 		return nil, err
 	}
 
 	//push sec type and fb dimensions
 	binary.Read(fbs, binary.BigEndian, &SecTypeNone)
 	if err != nil {
-		logger.Error("error reading rbs init - SecType: ", err)
+		logger.Error("FbsReader.ReadStartSession: error reading rbs init - SecType: ", err)
 	}
 
 	//read frame buffer width, height
 	binary.Read(fbs, binary.BigEndian, &framebufferWidth)
 	if err != nil {
-		logger.Error("error reading rbs init - FBWidth: ", err)
+		logger.Error("FbsReader.ReadStartSession: error reading rbs init - FBWidth: ", err)
 		return nil, err
 	}
 	initMsg.FBWidth = framebufferWidth
 
 	binary.Read(fbs, binary.BigEndian, &framebufferHeight)
 	if err != nil {
-		logger.Error("error reading rbs init - FBHeight: ", err)
+		logger.Error("FbsReader.ReadStartSession: error reading rbs init - FBHeight: ", err)
 		return nil, err
 	}
 	initMsg.FBHeight = framebufferHeight
@@ -109,7 +111,7 @@ func (fbs *FbsReader) ReadStartSession() (*common.ServerInit, error) {
 	pixelFormat := &common.PixelFormat{}
 	binary.Read(fbs, binary.BigEndian, pixelFormat)
 	if err != nil {
-		logger.Error("error reading rbs init - Pixelformat: ", err)
+		logger.Error("FbsReader.ReadStartSession: error reading rbs init - Pixelformat: ", err)
 		return nil, err
 	}
 	initMsg.PixelFormat = *pixelFormat
@@ -122,7 +124,7 @@ func (fbs *FbsReader) ReadStartSession() (*common.ServerInit, error) {
 	var desknameLen uint32
 	binary.Read(fbs, binary.BigEndian, &desknameLen)
 	if err != nil {
-		logger.Error("error reading rbs init - deskname Len: ", err)
+		logger.Error("FbsReader.ReadStartSession: error reading rbs init - deskname Len: ", err)
 		return nil, err
 	}
 	initMsg.NameLength = desknameLen
@@ -130,7 +132,7 @@ func (fbs *FbsReader) ReadStartSession() (*common.ServerInit, error) {
 	bytes = make([]byte, desknameLen)
 	fbs.Read(bytes)
 	if err != nil {
-		logger.Error("error reading rbs init - desktopName: ", err)
+		logger.Error("FbsReader.ReadStartSession: error reading rbs init - desktopName: ", err)
 		return nil, err
 	}
 
@@ -146,7 +148,7 @@ func (fbs *FbsReader) ReadSegment() (*FbsSegment, error) {
 	//read length
 	err := binary.Read(reader, binary.BigEndian, &bytesLen)
 	if err != nil {
-		logger.Error("error reading rbs file: ", err)
+		logger.Error("FbsReader.ReadStartSession: read len, error reading rbs file: ", err)
 		return nil, err
 	}
 
@@ -156,7 +158,7 @@ func (fbs *FbsReader) ReadSegment() (*FbsSegment, error) {
 	bytes := make([]byte, paddedSize)
 	_, err = reader.Read(bytes)
 	if err != nil {
-		logger.Error("error reading rbs file: ", err)
+		logger.Error("FbsReader.ReadSegment: read bytes, error reading rbs file: ", err)
 		return nil, err
 	}
 
@@ -167,7 +169,7 @@ func (fbs *FbsReader) ReadSegment() (*FbsSegment, error) {
 	var timeSinceStart uint32
 	binary.Read(reader, binary.BigEndian, &timeSinceStart)
 	if err != nil {
-		logger.Error("error reading rbs file: ", err)
+		logger.Error("FbsReader.ReadSegment: read timestamp, error reading rbs file: ", err)
 		return nil, err
 	}
 
diff --git a/player/player_test.go b/player/player_test.go
index 898bd16..a65dead 100644
--- a/player/player_test.go
+++ b/player/player_test.go
@@ -1,7 +1,6 @@
 package player
 
 import (
-
 	"testing"
 	"time"
 	"vncproxy/common"
@@ -10,9 +9,7 @@ import (
 	"vncproxy/server"
 )
 
-
-
-func loadFbsFile(filename string, conn *server.ServerConn) (*FbsReader, error) {
+func connectFbsFile(filename string, conn *server.ServerConn) (*FbsReader, error) {
 	fbs, err := NewFbsReader(filename)
 	if err != nil {
 		logger.Error("failed to open fbs reader:", err)
@@ -37,10 +34,23 @@ func TestServer(t *testing.T) {
 	//chServer := make(chan common.ClientMessage)
 	//chClient := make(chan common.ServerMessage)
 
+	encs := []common.IEncoding{
+		&encodings.RawEncoding{},
+		&encodings.TightEncoding{},
+		&encodings.EncCursorPseudo{},
+		//encodings.TightPngEncoding{},
+		&encodings.RREEncoding{},
+		&encodings.ZLibEncoding{},
+		&encodings.ZRLEEncoding{},
+		&encodings.CopyRectEncoding{},
+		&encodings.CoRREEncoding{},
+		&encodings.HextileEncoding{},
+	}
+
 	cfg := &server.ServerConfig{
 		//SecurityHandlers: []SecurityHandler{&ServerAuthNone{}, &ServerAuthVNC{}},
 		SecurityHandlers: []server.SecurityHandler{&server.ServerAuthNone{}},
-		Encodings:        []common.Encoding{&encodings.RawEncoding{}, &encodings.TightEncoding{}, &encodings.CopyRectEncoding{}},
+		Encodings:        encs,
 		PixelFormat:      common.NewPixelFormat(32),
 		ClientMessages:   server.DefaultClientMessages,
 		DesktopName:      []byte("workDesk"),
@@ -51,7 +61,7 @@ func TestServer(t *testing.T) {
 	cfg.NewConnHandler = func(cfg *server.ServerConfig, conn *server.ServerConn) error {
 		//fbs, err := loadFbsFile("/Users/amitbet/Dropbox/recording.rbs", conn)
 		//fbs, err := loadFbsFile("/Users/amitbet/vncRec/recording.rbs", conn)
-		fbs, err := loadFbsFile("/Users/amitbet/vncRec/recording1500411789.rbs", conn)
+		fbs, err := connectFbsFile("/Users/amitbet/vncRec/recording1500503851.rbs", conn)
 
 		if err != nil {
 			logger.Error("TestServer.NewConnHandler: Error in loading FBS: ", err)
diff --git a/proxy/message-listeners.go b/proxy/message-listeners.go
index ff855b6..9c4b0c1 100644
--- a/proxy/message-listeners.go
+++ b/proxy/message-listeners.go
@@ -24,7 +24,7 @@ func (cc *ClientUpdater) Consume(seg *common.RfbSegment) error {
 		case common.SetPixelFormatMsgType:
 			// update pixel format
 			logger.Debugf("ClientUpdater.Consume: updating pixel format")
-			pixFmtMsg := clientMsg.(*server.SetPixelFormat)
+			pixFmtMsg := clientMsg.(*server.MsgSetPixelFormat)
 			cc.conn.PixelFormat = pixFmtMsg.PF
 		}
 
diff --git a/proxy/proxy.go b/proxy/proxy.go
index 3f9deef..e17349b 100644
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -115,7 +115,7 @@ func (vp *VncProxy) newServerConnHandler(cfg *server.ServerConfig, sconn *server
 		return err
 	}
 
-	encs := []common.Encoding{
+	encs := []common.IEncoding{
 		&encodings.RawEncoding{},
 		&encodings.TightEncoding{},
 		&encodings.EncCursorPseudo{},
@@ -128,7 +128,7 @@ func (vp *VncProxy) newServerConnHandler(cfg *server.ServerConfig, sconn *server
 		&encodings.HextileEncoding{},
 	}
 	cconn.Encs = encs
-	//err = cconn.SetEncodings(encs)
+	//err = cconn.MsgSetEncodings(encs)
 	if err != nil {
 		logger.Errorf("Proxy.newServerConnHandler error connecting to client: %s", err)
 		return err
@@ -148,7 +148,7 @@ func (vp *VncProxy) StartListening() {
 	}
 	cfg := &server.ServerConfig{
 		SecurityHandlers: secHandlers,
-		Encodings:        []common.Encoding{&encodings.RawEncoding{}, &encodings.TightEncoding{}, &encodings.CopyRectEncoding{}},
+		Encodings:        []common.IEncoding{&encodings.RawEncoding{}, &encodings.TightEncoding{}, &encodings.CopyRectEncoding{}},
 		PixelFormat:      common.NewPixelFormat(32),
 		ClientMessages:   server.DefaultClientMessages,
 		DesktopName:      []byte("workDesk"),
diff --git a/server/client-messages.go b/server/client-messages.go
index eda20b5..554cfe5 100644
--- a/server/client-messages.go
+++ b/server/client-messages.go
@@ -6,13 +6,6 @@ import (
 	"vncproxy/common"
 )
 
-// SetPixelFormat holds the wire format message.
-type SetPixelFormat struct {
-	_  [3]byte            // padding
-	PF common.PixelFormat // pixel-format
-	_  [3]byte            // padding after pixel format
-}
-
 // Key represents a VNC key press.
 type Key uint32
 
@@ -21,11 +14,18 @@ type Key uint32
 // Keys is a slice of Key values.
 type Keys []Key
 
-func (*SetPixelFormat) Type() common.ClientMessageType {
+// MsgSetPixelFormat holds the wire format message.
+type MsgSetPixelFormat struct {
+	_  [3]byte            // padding
+	PF common.PixelFormat // pixel-format
+	_  [3]byte            // padding after pixel format
+}
+
+func (*MsgSetPixelFormat) Type() common.ClientMessageType {
 	return common.SetPixelFormatMsgType
 }
 
-func (msg *SetPixelFormat) Write(c io.Writer) error {
+func (msg *MsgSetPixelFormat) Write(c io.Writer) error {
 	if err := binary.Write(c, binary.BigEndian, msg.Type()); err != nil {
 		return err
 	}
@@ -43,27 +43,27 @@ func (msg *SetPixelFormat) Write(c io.Writer) error {
 	return nil
 }
 
-func (*SetPixelFormat) Read(c io.Reader) (common.ClientMessage, error) {
-	msg := SetPixelFormat{}
+func (*MsgSetPixelFormat) Read(c io.Reader) (common.ClientMessage, error) {
+	msg := MsgSetPixelFormat{}
 	if err := binary.Read(c, binary.BigEndian, &msg); err != nil {
 		return nil, err
 	}
 	return &msg, nil
 }
 
-// SetEncodings holds the wire format message, sans encoding-type field.
-type SetEncodings struct {
+// MsgSetEncodings holds the wire format message, sans encoding-type field.
+type MsgSetEncodings struct {
 	_         [1]byte // padding
 	EncNum    uint16  // number-of-encodings
 	Encodings []common.EncodingType
 }
 
-func (*SetEncodings) Type() common.ClientMessageType {
+func (*MsgSetEncodings) Type() common.ClientMessageType {
 	return common.SetEncodingsMsgType
 }
 
-func (*SetEncodings) Read(c io.Reader) (common.ClientMessage, error) {
-	msg := SetEncodings{}
+func (*MsgSetEncodings) Read(c io.Reader) (common.ClientMessage, error) {
+	msg := MsgSetEncodings{}
 	var pad [1]byte
 	if err := binary.Read(c, binary.BigEndian, &pad); err != nil {
 		return nil, err
@@ -79,11 +79,11 @@ func (*SetEncodings) Read(c io.Reader) (common.ClientMessage, error) {
 		}
 		msg.Encodings = append(msg.Encodings, enc)
 	}
-	c.(common.ServerConn).SetEncodings(msg.Encodings)
+	c.(common.IServerConn).SetEncodings(msg.Encodings)
 	return &msg, nil
 }
 
-func (msg *SetEncodings) Write(c io.Writer) error {
+func (msg *MsgSetEncodings) Write(c io.Writer) error {
 	if err := binary.Write(c, binary.BigEndian, msg.Type()); err != nil {
 		return err
 	}
@@ -107,26 +107,26 @@ func (msg *SetEncodings) Write(c io.Writer) error {
 	return nil
 }
 
-// FramebufferUpdateRequest holds the wire format message.
-type FramebufferUpdateRequest struct {
+// MsgFramebufferUpdateRequest holds the wire format message.
+type MsgFramebufferUpdateRequest struct {
 	Inc           uint8  // incremental
 	X, Y          uint16 // x-, y-position
 	Width, Height uint16 // width, height
 }
 
-func (*FramebufferUpdateRequest) Type() common.ClientMessageType {
+func (*MsgFramebufferUpdateRequest) Type() common.ClientMessageType {
 	return common.FramebufferUpdateRequestMsgType
 }
 
-func (*FramebufferUpdateRequest) Read(c io.Reader) (common.ClientMessage, error) {
-	msg := FramebufferUpdateRequest{}
+func (*MsgFramebufferUpdateRequest) Read(c io.Reader) (common.ClientMessage, error) {
+	msg := MsgFramebufferUpdateRequest{}
 	if err := binary.Read(c, binary.BigEndian, &msg); err != nil {
 		return nil, err
 	}
 	return &msg, nil
 }
 
-func (msg *FramebufferUpdateRequest) Write(c io.Writer) error {
+func (msg *MsgFramebufferUpdateRequest) Write(c io.Writer) error {
 	if err := binary.Write(c, binary.BigEndian, msg.Type()); err != nil {
 		return err
 	}
@@ -136,26 +136,26 @@ func (msg *FramebufferUpdateRequest) Write(c io.Writer) error {
 	return nil
 }
 
-// KeyEvent holds the wire format message.
-type KeyEvent struct {
+// MsgKeyEvent holds the wire format message.
+type MsgKeyEvent struct {
 	Down uint8   // down-flag
 	_    [2]byte // padding
 	Key  Key     // key
 }
 
-func (*KeyEvent) Type() common.ClientMessageType {
+func (*MsgKeyEvent) Type() common.ClientMessageType {
 	return common.KeyEventMsgType
 }
 
-func (*KeyEvent) Read(c io.Reader) (common.ClientMessage, error) {
-	msg := KeyEvent{}
+func (*MsgKeyEvent) Read(c io.Reader) (common.ClientMessage, error) {
+	msg := MsgKeyEvent{}
 	if err := binary.Read(c, binary.BigEndian, &msg); err != nil {
 		return nil, err
 	}
 	return &msg, nil
 }
 
-func (msg *KeyEvent) Write(c io.Writer) error {
+func (msg *MsgKeyEvent) Write(c io.Writer) error {
 	if err := binary.Write(c, binary.BigEndian, msg.Type()); err != nil {
 		return err
 	}
@@ -166,24 +166,24 @@ func (msg *KeyEvent) Write(c io.Writer) error {
 }
 
 // PointerEventMessage holds the wire format message.
-type PointerEvent struct {
+type MsgPointerEvent struct {
 	Mask uint8  // button-mask
 	X, Y uint16 // x-, y-position
 }
 
-func (*PointerEvent) Type() common.ClientMessageType {
+func (*MsgPointerEvent) Type() common.ClientMessageType {
 	return common.PointerEventMsgType
 }
 
-func (*PointerEvent) Read(c io.Reader) (common.ClientMessage, error) {
-	msg := PointerEvent{}
+func (*MsgPointerEvent) Read(c io.Reader) (common.ClientMessage, error) {
+	msg := MsgPointerEvent{}
 	if err := binary.Read(c, binary.BigEndian, &msg); err != nil {
 		return nil, err
 	}
 	return &msg, nil
 }
 
-func (msg *PointerEvent) Write(c io.Writer) error {
+func (msg *MsgPointerEvent) Write(c io.Writer) error {
 	if err := binary.Write(c, binary.BigEndian, msg.Type()); err != nil {
 		return err
 	}
@@ -193,14 +193,14 @@ func (msg *PointerEvent) Write(c io.Writer) error {
 	return nil
 }
 
-type ClientFence struct {
+type MsgClientFence struct {
 }
 
-func (*ClientFence) Type() common.ClientMessageType {
+func (*MsgClientFence) Type() common.ClientMessageType {
 	return common.ClientFenceMsgType
 }
 
-func (cf *ClientFence) Read(c io.Reader) (common.ClientMessage, error) {
+func (cf *MsgClientFence) Read(c io.Reader) (common.ClientMessage, error) {
 	bytes := make([]byte, 3)
 	c.Read(bytes)
 	if _, err := c.Read(bytes); err != nil {
@@ -223,23 +223,23 @@ func (cf *ClientFence) Read(c io.Reader) (common.ClientMessage, error) {
 	return cf, nil
 }
 
-func (msg *ClientFence) Write(c io.Writer) error {
+func (msg *MsgClientFence) Write(c io.Writer) error {
 	panic("not implemented!")
 }
 
-// ClientCutText holds the wire format message, sans the text field.
-type ClientCutText struct {
+// MsgClientCutText holds the wire format message, sans the text field.
+type MsgClientCutText struct {
 	_      [3]byte // padding
 	Length uint32  // length
 	Text   []byte
 }
 
-func (*ClientCutText) Type() common.ClientMessageType {
+func (*MsgClientCutText) Type() common.ClientMessageType {
 	return common.ClientCutTextMsgType
 }
 
-func (*ClientCutText) Read(c io.Reader) (common.ClientMessage, error) {
-	msg := ClientCutText{}
+func (*MsgClientCutText) Read(c io.Reader) (common.ClientMessage, error) {
+	msg := MsgClientCutText{}
 	var pad [3]byte
 	if err := binary.Read(c, binary.BigEndian, &pad); err != nil {
 		return nil, err
@@ -256,7 +256,7 @@ func (*ClientCutText) Read(c io.Reader) (common.ClientMessage, error) {
 	return &msg, nil
 }
 
-func (msg *ClientCutText) Write(c io.Writer) error {
+func (msg *MsgClientCutText) Write(c io.Writer) error {
 	if err := binary.Write(c, binary.BigEndian, msg.Type()); err != nil {
 		return err
 	}
diff --git a/server/security.go b/server/security.go
index a492751..e122834 100644
--- a/server/security.go
+++ b/server/security.go
@@ -49,7 +49,7 @@ const (
 type SecurityHandler interface {
 	Type() SecurityType
 	SubType() SecuritySubType
-	Auth(common.ServerConn) error
+	Auth(common.IServerConn) error
 }
 
 // type ClientAuthNone struct{}
@@ -62,7 +62,7 @@ type SecurityHandler interface {
 // 	return SecSubTypeUnknown
 // }
 
-// func (*ClientAuthNone) Auth(conn common.ServerConn) error {
+// func (*ClientAuthNone) Auth(conn common.IServerConn) error {
 // 	return nil
 // }
 
@@ -73,7 +73,7 @@ func (*ServerAuthNone) Type() SecurityType {
 	return SecTypeNone
 }
 
-func (*ServerAuthNone) Auth(c common.ServerConn) error {
+func (*ServerAuthNone) Auth(c common.IServerConn) error {
 	return nil
 }
 
@@ -95,7 +95,7 @@ func (*ServerAuthNone) SubType() SecuritySubType {
 // 	Password []byte
 // }
 
-// func (auth *ClientAuthVeNCrypt02Plain) Auth(c common.ServerConn) error {
+// func (auth *ClientAuthVeNCrypt02Plain) Auth(c common.IServerConn) error {
 // 	if err := binary.Write(c, binary.BigEndian, []uint8{0, 2}); err != nil {
 // 		return err
 // 	}
@@ -198,7 +198,7 @@ func (*ServerAuthVNC) SubType() SecuritySubType {
 
 const AUTH_FAIL = "Authentication Failure"
 
-func (auth *ServerAuthVNC) Auth(c common.ServerConn) error {
+func (auth *ServerAuthVNC) Auth(c common.IServerConn) error {
 	buf := make([]byte, 8+len([]byte(AUTH_FAIL)))
 	rand.Read(buf[:16]) // Random 16 bytes in buf
 	sndsz, err := c.Write(buf[:16])
@@ -290,7 +290,7 @@ func fixDesKey(key string) []byte {
 // 	return SecSubTypeUnknown
 // }
 
-// func (auth *ClientAuthVNC) Auth(c common.ServerConn) error {
+// func (auth *ClientAuthVNC) Auth(c common.IServerConn) error {
 // 	if len(auth.Password) == 0 {
 // 		return fmt.Errorf("Security Handshake failed; no password provided for VNCAuth.")
 // 	}
diff --git a/server/server-conn.go b/server/server-conn.go
index 297a110..7ef88f6 100644
--- a/server/server-conn.go
+++ b/server/server-conn.go
@@ -18,15 +18,14 @@ type ServerConn struct {
 	// If the pixel format uses a color map, then this is the color
 	// map that is used. This should not be modified directly, since
 	// the data comes from the server.
-	// Definition in §5 - Representation of Pixel Data.
 	colorMap *common.ColorMap
 
 	// Name associated with the desktop, sent from the server.
 	desktopName string
 
 	// Encodings supported by the client. This should not be modified
-	// directly. Instead, SetEncodings() should be used.
-	encodings []common.Encoding
+	// directly. Instead, MsgSetEncodings() should be used.
+	encodings []common.IEncoding
 
 	// Height of the frame buffer in pixels, sent to the client.
 	fbHeight uint16
@@ -47,7 +46,7 @@ type ServerConn struct {
 	quit chan struct{}
 }
 
-// func (c *ServerConn) UnreadByte() error {
+// func (c *IServerConn) UnreadByte() error {
 // 	return c.br.UnreadByte()
 // }
 
@@ -79,7 +78,7 @@ func (c *ServerConn) Conn() io.ReadWriter {
 }
 
 func (c *ServerConn) SetEncodings(encs []common.EncodingType) error {
-	encodings := make(map[int32]common.Encoding)
+	encodings := make(map[int32]common.IEncoding)
 	for _, enc := range c.cfg.Encodings {
 		encodings[enc.Type()] = enc
 	}
@@ -129,7 +128,7 @@ func (c *ServerConn) SetPixelFormat(pf *common.PixelFormat) error {
 	c.pixelFormat = pf
 	return nil
 }
-func (c *ServerConn) Encodings() []common.Encoding {
+func (c *ServerConn) Encodings() []common.IEncoding {
 	return c.encodings
 }
 func (c *ServerConn) Width() uint16 {
@@ -169,12 +168,12 @@ func (c *ServerConn) handle() error {
 		default:
 			var messageType common.ClientMessageType
 			if err := binary.Read(c, binary.BigEndian, &messageType); err != nil {
-				logger.Errorf("ServerConn.handle error: %v", err)
+				logger.Errorf("IServerConn.handle error: %v", err)
 				return err
 			}
 			msg, ok := clientMessages[messageType]
 			if !ok {
-				return fmt.Errorf("ServerConn.Handle: unsupported message-type: %v", messageType)
+				return fmt.Errorf("IServerConn.Handle: unsupported message-type: %v", messageType)
 			}
 
 			parsedMsg, err := msg.Read(c)
@@ -184,7 +183,7 @@ func (c *ServerConn) handle() error {
 			case common.SetPixelFormatMsgType:
 				// update pixel format
 				logger.Debugf("ClientUpdater.Consume: updating pixel format")
-				pixFmtMsg := parsedMsg.(*SetPixelFormat)
+				pixFmtMsg := parsedMsg.(*MsgSetPixelFormat)
 				c.SetPixelFormat(&pixFmtMsg.PF)
 				if pixFmtMsg.PF.TrueColor != 0 {
 					c.SetColorMap(&common.ColorMap{})
@@ -197,7 +196,7 @@ func (c *ServerConn) handle() error {
 				return err
 			}
 
-			logger.Infof("ServerConn.Handle got ClientMessage: %s, %v", parsedMsg.Type(), parsedMsg)
+			logger.Infof("IServerConn.Handle got ClientMessage: %s, %v", parsedMsg.Type(), parsedMsg)
 			//TODO: treat set encodings by allowing only supported encoding in proxy configurations
 			//// if parsedMsg.Type() == common.SetEncodingsMsgType{
 			//// 	c.cfg.Encodings
@@ -209,7 +208,7 @@ func (c *ServerConn) handle() error {
 			}
 			err = c.Listeners.Consume(seg)
 			if err != nil {
-				logger.Errorf("ServerConn.Handle: listener consume err %s", err.Error())
+				logger.Errorf("IServerConn.Handle: listener consume err %s", err.Error())
 				return err
 			}
 		}
diff --git a/server/server.go b/server/server.go
index 839bf7e..8e5f230 100644
--- a/server/server.go
+++ b/server/server.go
@@ -9,12 +9,12 @@ import (
 )
 
 var DefaultClientMessages = []common.ClientMessage{
-	&SetPixelFormat{},
-	&SetEncodings{},
-	&FramebufferUpdateRequest{},
-	&KeyEvent{},
-	&PointerEvent{},
-	&ClientCutText{},
+	&MsgSetPixelFormat{},
+	&MsgSetEncodings{},
+	&MsgFramebufferUpdateRequest{},
+	&MsgKeyEvent{},
+	&MsgPointerEvent{},
+	&MsgClientCutText{},
 }
 
 // FramebufferUpdate holds a FramebufferUpdate wire format message.
@@ -28,7 +28,7 @@ type ServerHandler func(*ServerConfig, *ServerConn) error
 
 type ServerConfig struct {
 	SecurityHandlers []SecurityHandler
-	Encodings        []common.Encoding
+	Encodings        []common.IEncoding
 	PixelFormat      *common.PixelFormat
 	ColorMap         *common.ColorMap
 	ClientMessages   []common.ClientMessage
diff --git a/server/server_test.go b/server/server_test.go
index eff7f01..1938959 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -20,13 +20,13 @@ func TestServer(t *testing.T) {
 	cfg := &ServerConfig{
 		//SecurityHandlers: []SecurityHandler{&ServerAuthNone{}, &ServerAuthVNC{}},
 		SecurityHandlers: []SecurityHandler{&ServerAuthVNC{"Ch_#!T@8"}},
-		Encodings:        []common.Encoding{&encodings.RawEncoding{}, &encodings.TightEncoding{}, &encodings.CopyRectEncoding{}},
+		Encodings:        []common.IEncoding{&encodings.RawEncoding{}, &encodings.TightEncoding{}, &encodings.CopyRectEncoding{}},
 		PixelFormat:      common.NewPixelFormat(32),
-		ClientMessages:  DefaultClientMessages,
-		DesktopName:     []byte("workDesk"),
-		Height:          uint16(768),
-		Width:           uint16(1024),
-		NewConnHandler:  newServerConnHandler,
+		ClientMessages:   DefaultClientMessages,
+		DesktopName:      []byte("workDesk"),
+		Height:           uint16(768),
+		Width:            uint16(1024),
+		NewConnHandler:   newServerConnHandler,
 	}
 	url := "http://localhost:8091/"
 	go WsServe(url, cfg)
diff --git a/server/ws-server-go.go b/server/ws-server-go.go
index 3094a85..d23161f 100644
--- a/server/ws-server-go.go
+++ b/server/ws-server-go.go
@@ -15,17 +15,9 @@ type WsServer struct {
 
 type WsHandler func(io.ReadWriter, *ServerConfig, string)
 
-// func checkOrigin(config *websocket.Config, req *http.Request) (err error) {
-// 	config.Origin, err = websocket.Origin(config, req)
-// 	if err == nil && config.Origin == nil {
-// 		return fmt.Errorf("null origin")
-// 	}
-// 	return err
-// }
 
-// This example demonstrates a trivial echo server.
 func (wsServer *WsServer) Listen(urlStr string, handlerFunc WsHandler) {
-	//http.Handle("/", websocket.Handler(EchoHandler))
+
 	if urlStr == "" {
 		urlStr = "/"
 	}
@@ -34,17 +26,6 @@ func (wsServer *WsServer) Listen(urlStr string, handlerFunc WsHandler) {
 		logger.Errorf("error while parsing url: ", err)
 	}
 
-	// http.HandleFunc(url.Path,
-	// 	func(w http.ResponseWriter, req *http.Request) {
-	// 		sessionId := req.URL.Query().Get("sessionId")
-	// 		s := websocket.Server{Handshake: checkOrigin, Handler: websocket.Handler(
-	// 			func(ws *websocket.ServerConn) {
-	// 				ws.PayloadType = websocket.BinaryFrame
-	// 				handlerFunc(ws, wsServer.cfg, sessionId)
-	// 			})}
-	// 		s.ServeHTTP(w, req)
-	// 	})
-
 	http.Handle(url.Path, websocket.Handler(
 		func(ws *websocket.Conn) {
 			path := ws.Request().URL.Path
diff --git a/server/ws_test.go b/server/ws_test.go
deleted file mode 100644
index abb4e43..0000000
--- a/server/ws_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package server
diff --git a/tee-listeners/recorder.go b/tee-listeners/recorder.go
index 40b7583..f6b0ee5 100644
--- a/tee-listeners/recorder.go
+++ b/tee-listeners/recorder.go
@@ -163,7 +163,7 @@ func (r *Recorder) HandleRfbSegment(data *common.RfbSegment) error {
 
 		switch clientMsg.Type() {
 		case common.SetPixelFormatMsgType:
-			clientMsg := data.Message.(*server.SetPixelFormat)
+			clientMsg := data.Message.(*server.MsgSetPixelFormat)
 			logger.Debugf("Recorder.HandleRfbSegment: client message %v", *clientMsg)
 			r.serverInitMessage.PixelFormat = clientMsg.PF
 		default: