diff --git a/netstack/Cargo.toml b/netstack/Cargo.toml
index ac485f4d45..c7bff84416 100644
--- a/netstack/Cargo.toml
+++ b/netstack/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [[bin]]
 name = "smolnetd"
-path = "src/smolnetd/main.rs"
+path = "src/main.rs"
 
 [lib]
 name = "redox_netstack"
diff --git a/netstack/src/smolnetd/buffer_pool.rs b/netstack/src/buffer_pool.rs
similarity index 100%
rename from netstack/src/smolnetd/buffer_pool.rs
rename to netstack/src/buffer_pool.rs
diff --git a/netstack/src/smolnetd/link/ethernet.rs b/netstack/src/link/ethernet.rs
similarity index 100%
rename from netstack/src/smolnetd/link/ethernet.rs
rename to netstack/src/link/ethernet.rs
diff --git a/netstack/src/smolnetd/link/loopback.rs b/netstack/src/link/loopback.rs
similarity index 100%
rename from netstack/src/smolnetd/link/loopback.rs
rename to netstack/src/link/loopback.rs
diff --git a/netstack/src/smolnetd/link/mod.rs b/netstack/src/link/mod.rs
similarity index 100%
rename from netstack/src/smolnetd/link/mod.rs
rename to netstack/src/link/mod.rs
diff --git a/netstack/src/smolnetd/main.rs b/netstack/src/main.rs
similarity index 100%
rename from netstack/src/smolnetd/main.rs
rename to netstack/src/main.rs
diff --git a/netstack/src/smolnetd/port_set.rs b/netstack/src/port_set.rs
similarity index 100%
rename from netstack/src/smolnetd/port_set.rs
rename to netstack/src/port_set.rs
diff --git a/netstack/src/smolnetd/router/mod.rs b/netstack/src/router/mod.rs
similarity index 100%
rename from netstack/src/smolnetd/router/mod.rs
rename to netstack/src/router/mod.rs
diff --git a/netstack/src/smolnetd/router/route_table.rs b/netstack/src/router/route_table.rs
similarity index 100%
rename from netstack/src/smolnetd/router/route_table.rs
rename to netstack/src/router/route_table.rs
diff --git a/netstack/src/smolnetd/scheme/icmp.rs b/netstack/src/scheme/icmp.rs
similarity index 100%
rename from netstack/src/smolnetd/scheme/icmp.rs
rename to netstack/src/scheme/icmp.rs
diff --git a/netstack/src/smolnetd/scheme/ip.rs b/netstack/src/scheme/ip.rs
similarity index 100%
rename from netstack/src/smolnetd/scheme/ip.rs
rename to netstack/src/scheme/ip.rs
diff --git a/netstack/src/smolnetd/scheme/mod.rs b/netstack/src/scheme/mod.rs
similarity index 100%
rename from netstack/src/smolnetd/scheme/mod.rs
rename to netstack/src/scheme/mod.rs
diff --git a/netstack/src/smolnetd/scheme/netcfg/mod.rs b/netstack/src/scheme/netcfg/mod.rs
similarity index 100%
rename from netstack/src/smolnetd/scheme/netcfg/mod.rs
rename to netstack/src/scheme/netcfg/mod.rs
diff --git a/netstack/src/smolnetd/scheme/netcfg/nodes.rs b/netstack/src/scheme/netcfg/nodes.rs
similarity index 100%
rename from netstack/src/smolnetd/scheme/netcfg/nodes.rs
rename to netstack/src/scheme/netcfg/nodes.rs
diff --git a/netstack/src/smolnetd/scheme/netcfg/notifier.rs b/netstack/src/scheme/netcfg/notifier.rs
similarity index 100%
rename from netstack/src/smolnetd/scheme/netcfg/notifier.rs
rename to netstack/src/scheme/netcfg/notifier.rs
diff --git a/netstack/src/smolnetd/scheme/socket.rs b/netstack/src/scheme/socket.rs
similarity index 100%
rename from netstack/src/smolnetd/scheme/socket.rs
rename to netstack/src/scheme/socket.rs
diff --git a/netstack/src/smolnetd/scheme/tcp.rs b/netstack/src/scheme/tcp.rs
similarity index 100%
rename from netstack/src/smolnetd/scheme/tcp.rs
rename to netstack/src/scheme/tcp.rs
diff --git a/netstack/src/smolnetd/scheme/udp.rs b/netstack/src/scheme/udp.rs
similarity index 100%
rename from netstack/src/smolnetd/scheme/udp.rs
rename to netstack/src/scheme/udp.rs