diff --git a/.gitignore b/.gitignore
index f8d1970..149d32e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /target
 clippable-cli/store.json
 msg
-clippable-server/target/
+api/target/
+api/dev/
 *.swp
 clippable-server/store.json
diff --git a/Cargo.lock b/Cargo.lock
index e82c74c..3682f37 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -160,7 +160,6 @@ name = "clippable"
 version = "0.1.0"
 dependencies = [
  "clap",
- "dblib",
  "rocket",
  "rocket_contrib",
  "serde",
@@ -171,7 +170,6 @@ name = "clippable-cli"
 version = "0.1.0"
 dependencies = [
  "clap",
- "dblib",
  "serde",
  "serde_json",
 ]
@@ -180,7 +178,6 @@ dependencies = [
 name = "clippable-server"
 version = "0.1.0"
 dependencies = [
- "dblib",
  "rocket",
  "rocket_contrib",
  "serde",
@@ -236,15 +233,6 @@ dependencies = [
  "cipher",
 ]
 
-[[package]]
-name = "dblib"
-version = "0.1.0"
-dependencies = [
- "rocket",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "devise"
 version = "0.2.0"
diff --git a/Cargo.toml b/Cargo.toml
index 054dea0..fb62b86 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,14 +6,13 @@ edition = "2018"
 
 [workspace]
 members = [
-	"clippable-server",
+	"api",
 	"clippable-cli",
-	"dblib"
 ]
 
-[lib]
-name = "dblib"
-path = "dblib/src/lib.rs"
+[[bin]]
+name = "api"
+path = "api/src/main.rs"
 
 [dependencies]
 # For json hehexd
@@ -26,8 +25,6 @@ clap = "2.33.3"
 rocket = "0.4"
 
 
-dblib = { path = "dblib" }
-
 [dependencies.rocket_contrib]
 version = "0.4.10"
 default-features = false
diff --git a/clippable-cli/Cargo.toml b/clippable-cli/Cargo.toml
index 8bd45ba..bed2de7 100644
--- a/clippable-cli/Cargo.toml
+++ b/clippable-cli/Cargo.toml
@@ -12,4 +12,3 @@ serde_json = { version = "1.0" }
 # For commanline parsing
 clap = "2.33.3"
 
-dblib = { path = "../dblib" }