diff --git a/src/api2/access.rs b/src/api2/access/mod.rs
similarity index 100%
rename from src/api2/access.rs
rename to src/api2/access/mod.rs
diff --git a/src/api2/admin.rs b/src/api2/admin/mod.rs
similarity index 100%
rename from src/api2/admin.rs
rename to src/api2/admin/mod.rs
diff --git a/src/api2/backup.rs b/src/api2/backup/mod.rs
similarity index 100%
rename from src/api2/backup.rs
rename to src/api2/backup/mod.rs
diff --git a/src/api2/config.rs b/src/api2/config/mod.rs
similarity index 100%
rename from src/api2/config.rs
rename to src/api2/config/mod.rs
diff --git a/src/api2.rs b/src/api2/mod.rs
similarity index 100%
rename from src/api2.rs
rename to src/api2/mod.rs
diff --git a/src/api2/node/disks.rs b/src/api2/node/disks/mod.rs
similarity index 100%
rename from src/api2/node/disks.rs
rename to src/api2/node/disks/mod.rs
diff --git a/src/api2/node.rs b/src/api2/node/mod.rs
similarity index 100%
rename from src/api2/node.rs
rename to src/api2/node/mod.rs
diff --git a/src/api2/reader.rs b/src/api2/reader/mod.rs
similarity index 100%
rename from src/api2/reader.rs
rename to src/api2/reader/mod.rs
diff --git a/src/backup.rs b/src/backup/mod.rs
similarity index 100%
rename from src/backup.rs
rename to src/backup/mod.rs
diff --git a/src/client.rs b/src/client/mod.rs
similarity index 100%
rename from src/client.rs
rename to src/client/mod.rs
diff --git a/src/config.rs b/src/config/mod.rs
similarity index 100%
rename from src/config.rs
rename to src/config/mod.rs
diff --git a/src/config/network.rs b/src/config/network/mod.rs
similarity index 100%
rename from src/config/network.rs
rename to src/config/network/mod.rs
diff --git a/src/server.rs b/src/server/mod.rs
similarity index 100%
rename from src/server.rs
rename to src/server/mod.rs
diff --git a/src/tools/disks.rs b/src/tools/disks/mod.rs
similarity index 100%
rename from src/tools/disks.rs
rename to src/tools/disks/mod.rs
diff --git a/src/tools.rs b/src/tools/mod.rs
similarity index 100%
rename from src/tools.rs
rename to src/tools/mod.rs
diff --git a/src/tools/systemd.rs b/src/tools/systemd/mod.rs
similarity index 100%
rename from src/tools/systemd.rs
rename to src/tools/systemd/mod.rs