diff --git a/Cargo.toml b/Cargo.toml
index f41eb04a..a5b14890 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,53 @@
+[package]
+name = "rojo"
+version = "0.5.0"
+authors = ["Lucien Greathouse <me@lpghatguy.com>"]
+description = "Enables professional-grade development tools for Roblox developers"
+license = "MIT"
+repository = "https://github.com/rojo-rbx/rojo"
+edition = "2018"
+
 [workspace]
 members = [
-	"server",
-	"rojo-test",
+    "rojo-test",
 ]
 
 [profile.dev]
-opt-level = 1
\ No newline at end of file
+opt-level = 1
+
+[lib]
+name = "librojo"
+path = "src/lib.rs"
+
+[[bin]]
+name = "rojo"
+path = "src/bin.rs"
+
+[dependencies]
+clap = "2.27"
+crossbeam-channel = "0.3.9"
+csv = "1.0"
+env_logger = "0.6"
+failure = "0.1.3"
+futures = "0.1"
+hyper = "0.12"
+jod-thread = "0.1.0"
+log = "0.4"
+maplit = "1.0.1"
+notify = "4.0"
+rbx_binary = "0.4.1"
+rbx_dom_weak = "1.9.0"
+rbx_reflection = "3.1.388"
+rbx_xml = "0.11.0"
+regex = "1.0"
+ritz = "0.1.0"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+uuid = { version = "0.7", features = ["v4", "serde"] }
+
+[dev-dependencies]
+lazy_static = "1.2"
+paste = "0.1"
+pretty_assertions = "0.6.1"
+tempfile = "3.0"
+walkdir = "2.1"
\ No newline at end of file
diff --git a/server/assets/index.css b/assets/index.css
similarity index 100%
rename from server/assets/index.css
rename to assets/index.css
diff --git a/server/assets/place.project.json b/assets/place.project.json
similarity index 100%
rename from server/assets/place.project.json
rename to assets/place.project.json
diff --git a/server/assets/test-folder.rbxm b/assets/test-folder.rbxm
similarity index 100%
rename from server/assets/test-folder.rbxm
rename to assets/test-folder.rbxm
diff --git a/rojo-test/Cargo.toml b/rojo-test/Cargo.toml
index 43403be0..c8072f3e 100644
--- a/rojo-test/Cargo.toml
+++ b/rojo-test/Cargo.toml
@@ -11,4 +11,4 @@ paste = "0.1.5"
 tempfile = "3.1.0"
 
 # We execute Rojo via std::process::Command, so depend on it so it's built!
-rojo = { path = "../server" }
\ No newline at end of file
+rojo = { path = ".." }
\ No newline at end of file
diff --git a/server/Cargo.toml b/server/Cargo.toml
deleted file mode 100644
index 066c123e..00000000
--- a/server/Cargo.toml
+++ /dev/null
@@ -1,49 +0,0 @@
-[package]
-name = "rojo"
-version = "0.5.0"
-authors = ["Lucien Greathouse <me@lpghatguy.com>"]
-description = "Enables professional-grade development tools for Roblox developers"
-license = "MIT"
-repository = "https://github.com/rojo-rbx/rojo"
-edition = "2018"
-
-[features]
-default = []
-server-plugins = []
-
-[lib]
-name = "librojo"
-path = "src/lib.rs"
-
-[[bin]]
-name = "rojo"
-path = "src/bin.rs"
-
-[dependencies]
-clap = "2.27"
-crossbeam-channel = "0.3.9"
-csv = "1.0"
-env_logger = "0.6"
-failure = "0.1.3"
-futures = "0.1"
-hyper = "0.12"
-jod-thread = "0.1.0"
-log = "0.4"
-maplit = "1.0.1"
-notify = "4.0"
-rbx_binary = "0.4.1"
-rbx_dom_weak = "1.9.0"
-rbx_reflection = "3.1.388"
-rbx_xml = "0.11.0"
-regex = "1.0"
-ritz = "0.1.0"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-uuid = { version = "0.7", features = ["v4", "serde"] }
-
-[dev-dependencies]
-lazy_static = "1.2"
-paste = "0.1"
-pretty_assertions = "0.6.1"
-tempfile = "3.0"
-walkdir = "2.1"
\ No newline at end of file
diff --git a/server/src/bin.rs b/src/bin.rs
similarity index 100%
rename from server/src/bin.rs
rename to src/bin.rs
diff --git a/server/src/commands/build.rs b/src/commands/build.rs
similarity index 100%
rename from server/src/commands/build.rs
rename to src/commands/build.rs
diff --git a/server/src/commands/init.rs b/src/commands/init.rs
similarity index 100%
rename from server/src/commands/init.rs
rename to src/commands/init.rs
diff --git a/server/src/commands/mod.rs b/src/commands/mod.rs
similarity index 100%
rename from server/src/commands/mod.rs
rename to src/commands/mod.rs
diff --git a/server/src/commands/serve.rs b/src/commands/serve.rs
similarity index 100%
rename from server/src/commands/serve.rs
rename to src/commands/serve.rs
diff --git a/server/src/commands/upload.rs b/src/commands/upload.rs
similarity index 100%
rename from server/src/commands/upload.rs
rename to src/commands/upload.rs
diff --git a/server/src/imfs/error.rs b/src/imfs/error.rs
similarity index 100%
rename from server/src/imfs/error.rs
rename to src/imfs/error.rs
diff --git a/server/src/imfs/fetcher.rs b/src/imfs/fetcher.rs
similarity index 100%
rename from server/src/imfs/fetcher.rs
rename to src/imfs/fetcher.rs
diff --git a/server/src/imfs/imfs.rs b/src/imfs/imfs.rs
similarity index 100%
rename from server/src/imfs/imfs.rs
rename to src/imfs/imfs.rs
diff --git a/server/src/imfs/mod.rs b/src/imfs/mod.rs
similarity index 100%
rename from server/src/imfs/mod.rs
rename to src/imfs/mod.rs
diff --git a/server/src/imfs/noop_fetcher.rs b/src/imfs/noop_fetcher.rs
similarity index 100%
rename from server/src/imfs/noop_fetcher.rs
rename to src/imfs/noop_fetcher.rs
diff --git a/server/src/imfs/real_fetcher.rs b/src/imfs/real_fetcher.rs
similarity index 100%
rename from server/src/imfs/real_fetcher.rs
rename to src/imfs/real_fetcher.rs
diff --git a/server/src/imfs/snapshot.rs b/src/imfs/snapshot.rs
similarity index 100%
rename from server/src/imfs/snapshot.rs
rename to src/imfs/snapshot.rs
diff --git a/server/src/impl_from.rs b/src/impl_from.rs
similarity index 100%
rename from server/src/impl_from.rs
rename to src/impl_from.rs
diff --git a/server/src/lib.rs b/src/lib.rs
similarity index 100%
rename from server/src/lib.rs
rename to src/lib.rs
diff --git a/server/src/message_queue.rs b/src/message_queue.rs
similarity index 100%
rename from server/src/message_queue.rs
rename to src/message_queue.rs
diff --git a/server/src/path_map.rs b/src/path_map.rs
similarity index 100%
rename from server/src/path_map.rs
rename to src/path_map.rs
diff --git a/server/src/path_serializer.rs b/src/path_serializer.rs
similarity index 100%
rename from server/src/path_serializer.rs
rename to src/path_serializer.rs
diff --git a/server/src/project.rs b/src/project.rs
similarity index 100%
rename from server/src/project.rs
rename to src/project.rs
diff --git a/server/src/serve_session.rs b/src/serve_session.rs
similarity index 100%
rename from server/src/serve_session.rs
rename to src/serve_session.rs
diff --git a/server/src/session_id.rs b/src/session_id.rs
similarity index 100%
rename from server/src/session_id.rs
rename to src/session_id.rs
diff --git a/server/src/snapshot/instance_snapshot.rs b/src/snapshot/instance_snapshot.rs
similarity index 100%
rename from server/src/snapshot/instance_snapshot.rs
rename to src/snapshot/instance_snapshot.rs
diff --git a/server/src/snapshot/mod.rs b/src/snapshot/mod.rs
similarity index 100%
rename from server/src/snapshot/mod.rs
rename to src/snapshot/mod.rs
diff --git a/server/src/snapshot/patch.rs b/src/snapshot/patch.rs
similarity index 100%
rename from server/src/snapshot/patch.rs
rename to src/snapshot/patch.rs
diff --git a/server/src/snapshot/patch_apply.rs b/src/snapshot/patch_apply.rs
similarity index 100%
rename from server/src/snapshot/patch_apply.rs
rename to src/snapshot/patch_apply.rs
diff --git a/server/src/snapshot/patch_compute.rs b/src/snapshot/patch_compute.rs
similarity index 100%
rename from server/src/snapshot/patch_compute.rs
rename to src/snapshot/patch_compute.rs
diff --git a/server/src/snapshot_middleware/context.rs b/src/snapshot_middleware/context.rs
similarity index 100%
rename from server/src/snapshot_middleware/context.rs
rename to src/snapshot_middleware/context.rs
diff --git a/server/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
similarity index 100%
rename from server/src/snapshot_middleware/csv.rs
rename to src/snapshot_middleware/csv.rs
diff --git a/server/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
similarity index 100%
rename from server/src/snapshot_middleware/dir.rs
rename to src/snapshot_middleware/dir.rs
diff --git a/server/src/snapshot_middleware/error.rs b/src/snapshot_middleware/error.rs
similarity index 100%
rename from server/src/snapshot_middleware/error.rs
rename to src/snapshot_middleware/error.rs
diff --git a/server/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
similarity index 100%
rename from server/src/snapshot_middleware/json_model.rs
rename to src/snapshot_middleware/json_model.rs
diff --git a/server/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
similarity index 100%
rename from server/src/snapshot_middleware/lua.rs
rename to src/snapshot_middleware/lua.rs
diff --git a/server/src/snapshot_middleware/middleware.rs b/src/snapshot_middleware/middleware.rs
similarity index 100%
rename from server/src/snapshot_middleware/middleware.rs
rename to src/snapshot_middleware/middleware.rs
diff --git a/server/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
similarity index 100%
rename from server/src/snapshot_middleware/mod.rs
rename to src/snapshot_middleware/mod.rs
diff --git a/server/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
similarity index 100%
rename from server/src/snapshot_middleware/project.rs
rename to src/snapshot_middleware/project.rs
diff --git a/server/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs
similarity index 100%
rename from server/src/snapshot_middleware/rbxm.rs
rename to src/snapshot_middleware/rbxm.rs
diff --git a/server/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs
similarity index 100%
rename from server/src/snapshot_middleware/rbxmx.rs
rename to src/snapshot_middleware/rbxmx.rs
diff --git a/server/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
similarity index 100%
rename from server/src/snapshot_middleware/txt.rs
rename to src/snapshot_middleware/txt.rs
diff --git a/server/src/web/api.rs b/src/web/api.rs
similarity index 100%
rename from server/src/web/api.rs
rename to src/web/api.rs
diff --git a/server/src/web/interface.rs b/src/web/interface.rs
similarity index 100%
rename from server/src/web/interface.rs
rename to src/web/interface.rs
diff --git a/server/src/web/mod.rs b/src/web/mod.rs
similarity index 100%
rename from server/src/web/mod.rs
rename to src/web/mod.rs
diff --git a/server/tests/read_projects.rs b/tests/read_projects.rs
similarity index 97%
rename from server/tests/read_projects.rs
rename to tests/read_projects.rs
index c0fa6438..55f0e1da 100644
--- a/server/tests/read_projects.rs
+++ b/tests/read_projects.rs
@@ -13,7 +13,7 @@ use librojo::project::{Project, ProjectNode};
 
 lazy_static! {
     static ref TEST_PROJECTS_ROOT: PathBuf =
-        { Path::new(env!("CARGO_MANIFEST_DIR")).join("../test-projects") };
+        { Path::new(env!("CARGO_MANIFEST_DIR")).join("test-projects") };
 }
 
 #[test]