diff --git a/Cargo.lock b/Cargo.lock
index 0ff9133..f6ebc59 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -698,9 +698,17 @@ dependencies = [
  "openssl-probe",
  "regex",
  "reqwest",
+ "serverdensity_udpserver_lib",
  "url",
 ]
 
+[[package]]
+name = "serverdensity_udpserver_lib"
+version = "0.1.0"
+dependencies = [
+ "bytes",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.5"
diff --git a/Cargo.toml b/Cargo.toml
index 6040e62..8f2a68e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,23 +1,6 @@
-[package]
-name = "serverdensity_udpserver"
-version = "0.1.0"
-authors = ["timglabisch <tim@ainfach.de>"]
-edition = "2021"
+[workspace]
 
-[dependencies]
-byteorder = "1.4.*"
-reqwest = { version = "0.11.*", features = ["blocking"] }
-clap = "3.0.*"
-url = "2.2.*"
-md5 = "0.7.*"
-regex = "1.5.*"
-openssl-probe = "0.1.*"
-bytes = "1.1.*"
-
-[[bin]]
-name = "serverdensity-udp-adgent"
-path = "src/main.rs"
-
-[lib]
-name = "serverdensity_udp_adgent"
-path = "src/lib/lib.rs"
\ No newline at end of file
+members = [
+    "serverdensity_udpserver",
+    "serverdensity_udpserver_lib",
+]
\ No newline at end of file
diff --git a/serverdensity_udpserver/Cargo.toml b/serverdensity_udpserver/Cargo.toml
new file mode 100644
index 0000000..7a36c17
--- /dev/null
+++ b/serverdensity_udpserver/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "serverdensity_udpserver"
+version = "0.1.0"
+authors = ["timglabisch <tim@ainfach.de>"]
+edition = "2021"
+
+[dependencies]
+byteorder = "1.4.*"
+reqwest = { version = "0.11.*", features = ["blocking"] }
+clap = "3.0.*"
+url = "2.2.*"
+md5 = "0.7.*"
+regex = "1.5.*"
+openssl-probe = "0.1.*"
+bytes = "1.1.*"
+serverdensity_udpserver_lib = { path = "../serverdensity_udpserver_lib" }
\ No newline at end of file
diff --git a/src/aggregator.rs b/serverdensity_udpserver/src/aggregator.rs
similarity index 99%
rename from src/aggregator.rs
rename to serverdensity_udpserver/src/aggregator.rs
index 12ed05c..f5ec45d 100644
--- a/src/aggregator.rs
+++ b/serverdensity_udpserver/src/aggregator.rs
@@ -9,7 +9,7 @@ use std::sync::mpsc::Receiver;
 use crate::Metric;
 use ::md5;
 use reqwest;
-use serverdensity_udp_adgent::MetricType;
+use serverdensity_udpserver_lib::MetricType;
 use crate::handler::{SumHandler, AverageHandler, PeakHandler, MinHandler};
 
 pub struct Aggregator<'a> {
diff --git a/src/config.rs b/serverdensity_udpserver/src/config.rs
similarity index 100%
rename from src/config.rs
rename to serverdensity_udpserver/src/config.rs
diff --git a/src/handler/mod.rs b/serverdensity_udpserver/src/handler/mod.rs
similarity index 100%
rename from src/handler/mod.rs
rename to serverdensity_udpserver/src/handler/mod.rs
diff --git a/src/main.rs b/serverdensity_udpserver/src/main.rs
similarity index 98%
rename from src/main.rs
rename to serverdensity_udpserver/src/main.rs
index 957ca22..0fb6c15 100644
--- a/src/main.rs
+++ b/serverdensity_udpserver/src/main.rs
@@ -14,7 +14,7 @@ mod handler;
 use clap::{Arg, App};
 use std::sync::mpsc::channel;
 use std::thread;
-use serverdensity_udp_adgent::MetricType;
+use serverdensity_udpserver_lib::MetricType;
 use crate::config::Config;
 use crate::aggregator::Aggregator;
 use crate::udpserver::UdpServer;
diff --git a/src/udpserver.rs b/serverdensity_udpserver/src/udpserver.rs
similarity index 97%
rename from src/udpserver.rs
rename to serverdensity_udpserver/src/udpserver.rs
index fc85ae7..42cf03c 100644
--- a/src/udpserver.rs
+++ b/serverdensity_udpserver/src/udpserver.rs
@@ -4,7 +4,7 @@ use byteorder::ByteOrder;
 use crate::config::Config;
 use crate::Metric;
 use std::sync::mpsc::Sender;
-use serverdensity_udp_adgent::MetricType;
+use serverdensity_udpserver_lib::MetricType;
 
 
 pub struct UdpServer;
diff --git a/serverdensity_udpserver_lib/Cargo.toml b/serverdensity_udpserver_lib/Cargo.toml
new file mode 100644
index 0000000..49723b5
--- /dev/null
+++ b/serverdensity_udpserver_lib/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "serverdensity_udpserver_lib"
+version = "0.1.0"
+authors = ["timglabisch <tim@ainfach.de>"]
+edition = "2021"
+
+[dependencies]
+bytes = "1.1.*"
\ No newline at end of file
diff --git a/src/lib/lib.rs b/serverdensity_udpserver_lib/src/lib.rs
similarity index 100%
rename from src/lib/lib.rs
rename to serverdensity_udpserver_lib/src/lib.rs