diff --git a/server/ActiveConnection.cs b/server/ActiveConnection.cs
index 3ba12ea..78953a7 100644
--- a/server/ActiveConnection.cs
+++ b/server/ActiveConnection.cs
@@ -9,8 +9,6 @@ namespace CircleScape {
     class ActiveConnection : Websocket.Connection {
         public ActiveConnection(TcpClient sock) : base(sock) { }
 
-        public ActiveConnection(PendingConnection conn) : base(conn) {
-
-        }
+        public ActiveConnection(PendingConnection conn) : base(conn) { }
     }
 }
diff --git a/server/CircleScape.csproj b/server/CircleScape.csproj
index d1b2c21..a316260 100644
--- a/server/CircleScape.csproj
+++ b/server/CircleScape.csproj
@@ -56,12 +56,18 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ActiveConnection.cs" />
+    <Compile Include="Database\Database.cs" />
+    <Compile Include="Database\Query.cs" />
+    <Compile Include="Database\Table.cs" />
     <Compile Include="Entrypoint.cs" />
+    <Compile Include="PendingConnection.cs" />
     <Compile Include="PoolManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utilities.cs" />
     <Compile Include="Websocket\Connection.cs" />
     <Compile Include="Websocket\Frame.cs" />
+    <Compile Include="Websocket\Handshake.cs" />
     <Compile Include="Websocket\Pool.cs" />
     <Compile Include="Websocket\Server.cs" />
     <Compile Include="Websocket\Stack.cs" />
diff --git a/server/Database/Database.cs b/server/Database/Database.cs
new file mode 100644
index 0000000..7650103
--- /dev/null
+++ b/server/Database/Database.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CircleScape.Database {
+    class Database {
+    }
+}
diff --git a/server/Database/Query.cs b/server/Database/Query.cs
new file mode 100644
index 0000000..7b159c0
--- /dev/null
+++ b/server/Database/Query.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CircleScape.Database {
+    class Query {
+    }
+}
diff --git a/server/Database/Table.cs b/server/Database/Table.cs
new file mode 100644
index 0000000..af47325
--- /dev/null
+++ b/server/Database/Table.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CircleScape.Database {
+    class Table {
+    }
+}
diff --git a/server/Entrypoint.cs b/server/Entrypoint.cs
index 0aa1437..3a922c0 100644
--- a/server/Entrypoint.cs
+++ b/server/Entrypoint.cs
@@ -1,24 +1,9 @@
-/***************************************/using
-    System                              ;using
-/***************************************/
-    System                              .
-     Collections                        .
-      Generic                           ;using
-/***************************************/
-    System                              .
-     Linq                               ;using
-/***************************************/
-    System                              . 
-     Text                               ;using
-/***************************************/
-    System                              .
-     Threading                          .
-      Tasks                             ;using
-/***************************************/
-    System                              .
-     Data                               .
-      SQLite                            ;
-/***************************************/
+using System;
+using System.Collections.Generic;
+using System.Data.SQLite;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace CircleScape {
     class Entrypoint {
diff --git a/server/PoolManager.cs b/server/PoolManager.cs
index a8711fa..3900030 100644
--- a/server/PoolManager.cs
+++ b/server/PoolManager.cs
@@ -21,11 +21,6 @@ namespace CircleScape {
             };
 
             ActiveConnectionsPool = new Pool<ActiveConnection>();
-
-            var test = new PendingConnection(new TcpClient());
-            var teste = test as ActiveConnection;
-
-            
         }
     }
 }
diff --git a/server/Websocket/Frame.cs b/server/Websocket/Frame.cs
index 7563ad3..b2c21f1 100644
--- a/server/Websocket/Frame.cs
+++ b/server/Websocket/Frame.cs
@@ -6,6 +6,20 @@ using System.Threading.Tasks;
 
 namespace CircleScape.Websocket {
     class Frame {
+        public enum kOpcode {
+            Continuation    = 0x0,
+            TextFrame       = 0x1,
+            BinaryFrame     = 0x2,
+            Close           = 0x8,
+            Ping            = 0x9,
+            Pong            = 0xA
+        };
+
+        public kOpcode Opcode { get; private set; }
+        public bool IsFinal { get; private set; }
+        public bool IsMasked { get; private set; }
+        public byte[] Mask { get; private set; }
+        public byte Reserved { get; private set; }
 
     }
 }
diff --git a/server/scape.db b/server/scape.db
index 5a29be2..ace31b0 100644
Binary files a/server/scape.db and b/server/scape.db differ