diff --git a/cryps-rs/.gitignore b/.gitignore
old mode 100755
new mode 100644
similarity index 63%
rename from cryps-rs/.gitignore
rename to .gitignore
index 4308d822..2c96eb1b
--- a/cryps-rs/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 target/
-**/*.rs.bk
 Cargo.lock
diff --git a/cryps-rs/Cargo.toml b/Cargo.toml
similarity index 100%
rename from cryps-rs/Cargo.toml
rename to Cargo.toml
diff --git a/cryps-rs/README.md b/README.md
similarity index 100%
rename from cryps-rs/README.md
rename to README.md
diff --git a/api/.gitignore b/api/.gitignore
deleted file mode 100644
index c2658d7d..00000000
--- a/api/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules/
diff --git a/api/index.js b/api/index.js
deleted file mode 100755
index 0d53190d..00000000
--- a/api/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-const createServer = require('./src/server');
-createServer();
diff --git a/api/package-lock.json b/api/package-lock.json
deleted file mode 100644
index f50285ed..00000000
--- a/api/package-lock.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "cryps-api",
-  "version": "1.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "async-limiter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
-    },
-    "ws": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.0.0.tgz",
-      "integrity": "sha512-c2UlYcAZp1VS8AORtpq6y4RJIkJ9dQz18W32SpR/qXGfLDZ2jU4y4wKvvZwqbi7U6gxFQTeE+urMbXU/tsDy4w==",
-      "requires": {
-        "async-limiter": "~1.0.0"
-      }
-    }
-  }
-}
diff --git a/api/package.json b/api/package.json
deleted file mode 100755
index 6c861c5f..00000000
--- a/api/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "cryps-api",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "start": "node index.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "ws": "^6.0.0"
-  }
-}
diff --git a/api/src/client.test.js b/api/src/client.test.js
deleted file mode 100755
index d360ecab..00000000
--- a/api/src/client.test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const WebSocket = require('ws');
-
-const ws = new WebSocket('ws://cryps.gg:40080');
-
-ws.on('open', function open() {
-  ws.send('something else');
-});
-
-ws.on('message', function incoming(data) {
-  console.log(data);
-});
\ No newline at end of file
diff --git a/api/src/server.js b/api/src/server.js
deleted file mode 100755
index ca877b2e..00000000
--- a/api/src/server.js
+++ /dev/null
@@ -1,19 +0,0 @@
-const WebSocket = require('ws');
-
-function createServer() {
-  const wss = new WebSocket.Server({ port: 40080 });
-
-  console.log('i am listening...');
-
-  wss.on('connection', function connection(ws) {
-    ws.on('message', function incoming(message) {
-      console.log('received: %s', message);
-    });
-
-    ws.send('sup');
-  });
-
-  return wss;
-}
-
-module.exports = createServer;
diff --git a/cryps-rs/src/main.rs b/cryps-rs/src/main.rs
deleted file mode 100755
index c6cecc2a..00000000
--- a/cryps-rs/src/main.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-//! A "hello world" echo server with Tokio
-//!
-//! This server will create a TCP listener, accept connections in a loop, and
-//! write back everything that's read off of each TCP connection.
-//!
-//! Because the Tokio runtime uses a thread pool, each TCP connection is
-//! processed concurrently with all other TCP connections across multiple
-//! threads.
-//!
-//! To see this server in action, you can run this in one terminal:
-//!
-//!     cargo run --example echo
-//!
-//! and in another terminal you can run:
-//!
-//!     cargo run --example connect 127.0.0.1:40000
-//!
-//! Each line you type in to the `connect` terminal should be echo'd back to
-//! you! If you open up multiple terminals running the `connect` example you
-//! should be able to see them all make progress simultaneously.
-
-#![deny(warnings)]
-
-extern crate tokio;
-
-use tokio::io;
-use tokio::net::TcpListener;
-use tokio::prelude::*;
-
-use std::env;
-use std::net::SocketAddr;
-
-fn main() {
-    // Allow passing an address to listen on as the first argument of this
-    // program, but otherwise we'll just set up our TCP listener on
-    // 127.0.0.1:40000 for connections.
-    let addr = env::args().nth(1).unwrap_or("0.0.0.0:40000".to_string());
-    let addr = addr.parse::<SocketAddr>().unwrap();
-
-    // Next up we create a TCP listener which will listen for incoming
-    // connections. This TCP listener is bound to the address we determined
-    // above and must be associated with an event loop, so we pass in a handle
-    // to our event loop. After the socket's created we inform that we're ready
-    // to go and start accepting connections.
-    let socket = TcpListener::bind(&addr).unwrap();
-    println!("Listening on: {}", addr);
-
-    // Here we convert the `TcpListener` to a stream of incoming connections
-    // with the `incoming` method. We then define how to process each element in
-    // the stream with the `for_each` method.
-    //
-    // This combinator, defined on the `Stream` trait, will allow us to define a
-    // computation to happen for all items on the stream (in this case TCP
-    // connections made to the server).  The return value of the `for_each`
-    // method is itself a future representing processing the entire stream of
-    // connections, and ends up being our server.
-    let done = socket.incoming()
-        .map_err(|e| println!("failed to accept socket; error = {:?}", e))
-        .for_each(move |socket| {
-            // Once we're inside this closure this represents an accepted client
-            // from our server. The `socket` is the client connection (similar to
-            // how the standard library operates).
-            //
-            // We just want to copy all data read from the socket back onto the
-            // socket itself (e.g. "echo"). We can use the standard `io::copy`
-            // combinator in the `tokio-core` crate to do precisely this!
-            //
-            // The `copy` function takes two arguments, where to read from and where
-            // to write to. We only have one argument, though, with `socket`.
-            // Luckily there's a method, `Io::split`, which will split an Read/Write
-            // stream into its two halves. This operation allows us to work with
-            // each stream independently, such as pass them as two arguments to the
-            // `copy` function.
-            //
-            // The `copy` function then returns a future, and this future will be
-            // resolved when the copying operation is complete, resolving to the
-            // amount of data that was copied.
-            let (reader, writer) = socket.split();
-            let amt = io::copy(reader, writer);
-
-            // After our copy operation is complete we just print out some helpful
-            // information.
-            let msg = amt.then(move |result| {
-                match result {
-                    Ok((amt, _, _)) => println!("wrote {} bytes", amt),
-                    Err(e) => println!("error: {}", e),
-                }
-
-                Ok(())
-            });
-
-
-            // And this is where much of the magic of this server happens. We
-            // crucially want all clients to make progress concurrently, rather than
-            // blocking one on completion of another. To achieve this we use the
-            // `tokio::spawn` function to execute the work in the background.
-            //
-            // This function will transfer ownership of the future (`msg` in this
-            // case) to the Tokio runtime thread pool that. The thread pool will
-            // drive the future to completion.
-            //
-            // Essentially here we're executing a new task to run concurrently,
-            // which will allow all of our clients to be processed concurrently.
-            tokio::spawn(msg)
-        });
-
-    // And finally now that we've define what our server is, we run it!
-    //
-    // This starts the Tokio runtime, spawns the server task, and blocks the
-    // current thread until all tasks complete execution. Since the `done` task
-    // never completes (it just keeps accepting sockets), `tokio::run` blocks
-    // forever (until ctrl-c is pressed).
-    tokio::run(done);
-}
diff --git a/cryps-rs/src/battle.rs b/src/battle.rs
similarity index 100%
rename from cryps-rs/src/battle.rs
rename to src/battle.rs
diff --git a/cryps-rs/src/combat.rs b/src/combat.rs
similarity index 100%
rename from cryps-rs/src/combat.rs
rename to src/combat.rs
diff --git a/cryps-rs/src/cryp.rs b/src/cryp.rs
similarity index 100%
rename from cryps-rs/src/cryp.rs
rename to src/cryp.rs
diff --git a/cryps-rs/src/lib.rs b/src/lib.rs
similarity index 100%
rename from cryps-rs/src/lib.rs
rename to src/lib.rs
diff --git a/src/main.rs b/src/main.rs
new file mode 100755
index 00000000..2ccd3620
--- /dev/null
+++ b/src/main.rs
@@ -0,0 +1,33 @@
+extern crate tokio;
+
+use tokio::io;
+use tokio::net::TcpListener;
+use tokio::prelude::*;
+
+use std::net::SocketAddr;
+
+fn main() {
+    let addr = "0.0.0.0:40000".to_string();
+    let addr = addr.parse::<SocketAddr>().unwrap();
+
+    let listener = TcpListener::bind(&addr).unwrap();
+    println!("Listening on: {}", addr);
+
+    let done = listener.incoming()
+        .map_err(|e| println!("failed to accept socket; error = {:?}", e))
+        .for_each(|socket| {
+            let (reader, writer) = socket.split();
+            let amt = io::copy(reader, writer);
+
+            let msg = amt.then(move |result| {
+                match result {
+                    Ok((amt, _, _)) => println!("wrote {} bytes", amt),
+                    Err(e) => println!("error: {}", e),
+                }
+
+                Ok(())
+            });
+            tokio::spawn(msg)
+        });
+    tokio::run(done);
+}
diff --git a/cryps-rs/src/server.rs b/src/server.rs
similarity index 100%
rename from cryps-rs/src/server.rs
rename to src/server.rs
diff --git a/cryps-rs/src/skill.rs b/src/skill.rs
similarity index 100%
rename from cryps-rs/src/skill.rs
rename to src/skill.rs