diff --git a/src/cli/mod.rs b/src/cli.rs
similarity index 100%
rename from src/cli/mod.rs
rename to src/cli.rs
diff --git a/src/client/mod.rs b/src/client.rs
similarity index 100%
rename from src/client/mod.rs
rename to src/client.rs
diff --git a/src/daemon/mod.rs b/src/daemon.rs
similarity index 97%
rename from src/daemon/mod.rs
rename to src/daemon.rs
index ac3a6dbc..1774fbbb 100644
--- a/src/daemon/mod.rs
+++ b/src/daemon.rs
@@ -69,9 +69,9 @@ pub enum FgEvent {
 }
 
 pub struct LastKnown {
-    fetch: Result<(), ReleaseError>,
+    fetch:            Result<(), ReleaseError>,
     recovery_upgrade: Result<(), RecoveryError>,
-    release_upgrade: Result<(), ReleaseError>,
+    release_upgrade:  Result<(), ReleaseError>,
 }
 
 impl Default for LastKnown {
@@ -82,20 +82,20 @@ impl Default for LastKnown {
 
 pub struct ReleaseUpgradeState {
     action: release::UpgradeMethod,
-    from: Box<str>,
-    to: Box<str>,
+    from:   Box<str>,
+    to:     Box<str>,
 }
 
 pub struct Daemon {
-    event_tx: Sender<Event>,
-    fg_rx: Receiver<FgEvent>,
-    dbus_rx: Receiver<SignalEvent>,
-    connection: Arc<Connection>,
-    status: Arc<Atomic<DaemonStatus>>,
-    sub_status: Arc<Atomic<u8>>,
-    fetching_state: Arc<Atomic<(u64, u64)>>,
-    cancel: Arc<AtomicBool>,
-    last_known: LastKnown,
+    event_tx:        Sender<Event>,
+    fg_rx:           Receiver<FgEvent>,
+    dbus_rx:         Receiver<SignalEvent>,
+    connection:      Arc<Connection>,
+    status:          Arc<Atomic<DaemonStatus>>,
+    sub_status:      Arc<Atomic<u8>>,
+    fetching_state:  Arc<Atomic<(u64, u64)>>,
+    cancel:          Arc<AtomicBool>,
+    last_known:      LastKnown,
     release_upgrade: Option<ReleaseUpgradeState>,
     perform_upgrade: bool,
 }
@@ -630,8 +630,8 @@ impl Daemon {
 
         let event = Event::RecoveryUpgrade(RecoveryUpgradeMethod::FromRelease {
             version: if version.is_empty() { None } else { Some(version.into()) },
-            arch: if arch.is_empty() { None } else { Some(arch.into()) },
-            flags: RecoveryReleaseFlags::from_bits_truncate(flags),
+            arch:    if arch.is_empty() { None } else { Some(arch.into()) },
+            flags:   RecoveryReleaseFlags::from_bits_truncate(flags),
         });
 
         self.submit_event(event)
diff --git a/src/fetch.rs b/src/fetch.rs
new file mode 100644
index 00000000..502f1b66
--- /dev/null
+++ b/src/fetch.rs
@@ -0,0 +1,35 @@
+pub mod apt {
+    use anyhow::Context;
+    use apt_cmd::{lock::apt_lock_wait, request::Request as AptRequest, AptGet};
+    use std::collections::HashSet;
+
+    pub async fn fetch_uris(packages: Option<&[&str]>) -> anyhow::Result<HashSet<AptRequest>> {
+        apt_lock_wait().await;
+        let mut uris = AptGet::new()
+            .noninteractive()
+            .fetch_uris(&["full-upgrade"])
+            .await
+            .context("failed to exec `apt-get full-upgrade --print-uris`")?
+            .context("failed to fetch package URIs from apt-get full-upgrade")?;
+
+        if let Some(packages) = packages {
+            apt_lock_wait().await;
+            let install_uris = AptGet::new()
+                .noninteractive()
+                .fetch_uris(&{
+                    let mut args = vec!["install"];
+                    args.extend_from_slice(packages);
+                    args
+                })
+                .await
+                .context("failed to exec `apt-get install --print-uris`")?
+                .context("failed to fetch package URIs from `apt-get install`")?;
+
+            for uri in install_uris {
+                uris.insert(uri);
+            }
+        }
+
+        Ok(uris)
+    }
+}
diff --git a/src/fetch/apt.rs b/src/fetch/apt.rs
deleted file mode 100644
index a2fda5d4..00000000
--- a/src/fetch/apt.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use anyhow::Context;
-use apt_cmd::{lock::apt_lock_wait, request::Request as AptRequest, AptGet};
-use std::collections::HashSet;
-
-pub async fn fetch_uris(packages: Option<&[&str]>) -> anyhow::Result<HashSet<AptRequest>> {
-    apt_lock_wait().await;
-    let mut uris = AptGet::new()
-        .noninteractive()
-        .fetch_uris(&["full-upgrade"])
-        .await
-        .context("failed to exec `apt-get full-upgrade --print-uris`")?
-        .context("failed to fetch package URIs from apt-get full-upgrade")?;
-
-    if let Some(packages) = packages {
-        apt_lock_wait().await;
-        let install_uris = AptGet::new()
-            .noninteractive()
-            .fetch_uris(&{
-                let mut args = vec!["install"];
-                args.extend_from_slice(packages);
-                args
-            })
-            .await
-            .context("failed to exec `apt-get install --print-uris`")?
-            .context("failed to fetch package URIs from `apt-get install`")?;
-
-        for uri in install_uris {
-            uris.insert(uri);
-        }
-    }
-
-    Ok(uris)
-}
diff --git a/src/fetch/mod.rs b/src/fetch/mod.rs
deleted file mode 100644
index 10b33766..00000000
--- a/src/fetch/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod apt;
diff --git a/src/recovery/mod.rs b/src/recovery.rs
similarity index 100%
rename from src/recovery/mod.rs
rename to src/recovery.rs
diff --git a/src/release/mod.rs b/src/release.rs
similarity index 100%
rename from src/release/mod.rs
rename to src/release.rs
diff --git a/src/repair/mod.rs b/src/repair.rs
similarity index 100%
rename from src/repair/mod.rs
rename to src/repair.rs