diff --git a/backend/src/main.rs b/backend/src/main.rs
index 4ebe808..8be06c1 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -28,7 +28,7 @@ fn main() {
     };
 }
 
-use mozaic::server::runtime::{Broker};
+use mozaic::runtime::{Broker};
 use rand::Rng;
 use errors::Consumable;
 use mozaic::modules::ConnectionManager;
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 508e5e1..288146e 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-mozaic = { git = "https://github.com/ajuvercr/MOZAIC" }
+mozaic = { git = "https://github.com/ZeusWPI/MOZAICP" }
 tokio = "0.1.22"
 capnp = "0.10.1"
 futures = "0.1.28"
diff --git a/client/run.sh b/client/run.sh
index 6436fed..1965c69 100755
--- a/client/run.sh
+++ b/client/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 rm bot*.txt
-cargo run $1 python simple.py
+cargo run $1 python3 simple.py
diff --git a/client/src/main.rs b/client/src/main.rs
index fbc15d5..2cc756e 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -15,10 +15,11 @@ use mozaic::core_capnp::{initialize, terminate_stream, identify, actor_joined};
 use mozaic::messaging::reactor::*;
 use mozaic::messaging::types::*;
 use mozaic::errors::*;
-use mozaic::client_capnp::{client_message, host_message, client_kicked};
-use mozaic::mozaic_cmd_capnp::{bot_input, bot_return};
-use mozaic::server::runtime::{Broker, BrokerHandle};
-use mozaic::server;
+use mozaic::base_capnp::{client_message, host_message};
+use mozaic::connection_capnp::client_kicked;
+use mozaic::cmd_capnp::{bot_input, bot_return};
+use mozaic::runtime::{Broker, BrokerHandle};
+use mozaic::runtime;
 use mozaic::modules::{BotReactor};
 
 use std::env;
@@ -44,7 +45,7 @@ fn main() {
         };
         broker.spawn(self_id.clone(), reactor.params(), "main").display();
 
-        tokio::spawn(server::connect_to_server(broker, self_id, &addr));
+        tokio::spawn(runtime::connect_to_server(broker, self_id, &addr));
         Ok(())
     }));
 }