diff --git a/aquatic_ws/Cargo.toml b/aquatic_ws/Cargo.toml
index 0cb4a90..d01fab8 100644
--- a/aquatic_ws/Cargo.toml
+++ b/aquatic_ws/Cargo.toml
@@ -9,11 +9,9 @@ repository = "https://github.com/greatest-ape/aquatic"
 
 [lib]
 name = "aquatic_ws"
-path = "src/lib/lib.rs"
 
 [[bin]]
 name = "aquatic_ws"
-path = "src/bin/main.rs"
 
 [features]
 default = ["with-mio"]
diff --git a/aquatic_ws/src/lib/common/handlers.rs b/aquatic_ws/src/common/handlers.rs
similarity index 100%
rename from aquatic_ws/src/lib/common/handlers.rs
rename to aquatic_ws/src/common/handlers.rs
diff --git a/aquatic_ws/src/lib/common/mod.rs b/aquatic_ws/src/common/mod.rs
similarity index 100%
rename from aquatic_ws/src/lib/common/mod.rs
rename to aquatic_ws/src/common/mod.rs
diff --git a/aquatic_ws/src/lib/config.rs b/aquatic_ws/src/config.rs
similarity index 100%
rename from aquatic_ws/src/lib/config.rs
rename to aquatic_ws/src/config.rs
diff --git a/aquatic_ws/src/lib/glommio/common.rs b/aquatic_ws/src/glommio/common.rs
similarity index 100%
rename from aquatic_ws/src/lib/glommio/common.rs
rename to aquatic_ws/src/glommio/common.rs
diff --git a/aquatic_ws/src/lib/glommio/handlers.rs b/aquatic_ws/src/glommio/handlers.rs
similarity index 100%
rename from aquatic_ws/src/lib/glommio/handlers.rs
rename to aquatic_ws/src/glommio/handlers.rs
diff --git a/aquatic_ws/src/lib/glommio/mod.rs b/aquatic_ws/src/glommio/mod.rs
similarity index 100%
rename from aquatic_ws/src/lib/glommio/mod.rs
rename to aquatic_ws/src/glommio/mod.rs
diff --git a/aquatic_ws/src/lib/glommio/network.rs b/aquatic_ws/src/glommio/network.rs
similarity index 100%
rename from aquatic_ws/src/lib/glommio/network.rs
rename to aquatic_ws/src/glommio/network.rs
diff --git a/aquatic_ws/src/lib/lib.rs b/aquatic_ws/src/lib.rs
similarity index 100%
rename from aquatic_ws/src/lib/lib.rs
rename to aquatic_ws/src/lib.rs
diff --git a/aquatic_ws/src/bin/main.rs b/aquatic_ws/src/main.rs
similarity index 100%
rename from aquatic_ws/src/bin/main.rs
rename to aquatic_ws/src/main.rs
diff --git a/aquatic_ws/src/lib/mio/common.rs b/aquatic_ws/src/mio/common.rs
similarity index 100%
rename from aquatic_ws/src/lib/mio/common.rs
rename to aquatic_ws/src/mio/common.rs
diff --git a/aquatic_ws/src/lib/mio/handlers.rs b/aquatic_ws/src/mio/handlers.rs
similarity index 100%
rename from aquatic_ws/src/lib/mio/handlers.rs
rename to aquatic_ws/src/mio/handlers.rs
diff --git a/aquatic_ws/src/lib/mio/mod.rs b/aquatic_ws/src/mio/mod.rs
similarity index 100%
rename from aquatic_ws/src/lib/mio/mod.rs
rename to aquatic_ws/src/mio/mod.rs
diff --git a/aquatic_ws/src/lib/mio/network/connection.rs b/aquatic_ws/src/mio/network/connection.rs
similarity index 100%
rename from aquatic_ws/src/lib/mio/network/connection.rs
rename to aquatic_ws/src/mio/network/connection.rs
diff --git a/aquatic_ws/src/lib/mio/network/mod.rs b/aquatic_ws/src/mio/network/mod.rs
similarity index 100%
rename from aquatic_ws/src/lib/mio/network/mod.rs
rename to aquatic_ws/src/mio/network/mod.rs
diff --git a/aquatic_ws/src/lib/mio/network/utils.rs b/aquatic_ws/src/mio/network/utils.rs
similarity index 100%
rename from aquatic_ws/src/lib/mio/network/utils.rs
rename to aquatic_ws/src/mio/network/utils.rs
diff --git a/aquatic_ws/src/lib/tasks.rs b/aquatic_ws/src/tasks.rs
similarity index 100%
rename from aquatic_ws/src/lib/tasks.rs
rename to aquatic_ws/src/tasks.rs