diff --git a/melib/src/addressbook/mod.rs b/melib/src/addressbook.rs
similarity index 100%
rename from melib/src/addressbook/mod.rs
rename to melib/src/addressbook.rs
diff --git a/melib/src/conf/mod.rs b/melib/src/conf.rs
similarity index 100%
rename from melib/src/conf/mod.rs
rename to melib/src/conf.rs
diff --git a/melib/src/mailbox/mod.rs b/melib/src/mailbox.rs
similarity index 100%
rename from melib/src/mailbox/mod.rs
rename to melib/src/mailbox.rs
diff --git a/melib/src/mailbox/backends/mod.rs b/melib/src/mailbox/backends.rs
similarity index 100%
rename from melib/src/mailbox/backends/mod.rs
rename to melib/src/mailbox/backends.rs
diff --git a/melib/src/mailbox/backends/maildir/mod.rs b/melib/src/mailbox/backends/maildir.rs
similarity index 100%
rename from melib/src/mailbox/backends/maildir/mod.rs
rename to melib/src/mailbox/backends/maildir.rs
diff --git a/melib/src/mailbox/email/mod.rs b/melib/src/mailbox/email.rs
similarity index 100%
rename from melib/src/mailbox/email/mod.rs
rename to melib/src/mailbox/email.rs
diff --git a/melib/src/mailbox/email/compose/mod.rs b/melib/src/mailbox/email/compose.rs
similarity index 100%
rename from melib/src/mailbox/email/compose/mod.rs
rename to melib/src/mailbox/email/compose.rs
diff --git a/ui/src/components/mod.rs b/ui/src/components.rs
similarity index 100%
rename from ui/src/components/mod.rs
rename to ui/src/components.rs
diff --git a/ui/src/components/indexer/mod.rs b/ui/src/components/indexer.rs
similarity index 100%
rename from ui/src/components/indexer/mod.rs
rename to ui/src/components/indexer.rs
diff --git a/ui/src/components/mail/mod.rs b/ui/src/components/mail.rs
similarity index 100%
rename from ui/src/components/mail/mod.rs
rename to ui/src/components/mail.rs
diff --git a/ui/src/components/mail/accounts/mod.rs b/ui/src/components/mail/accounts.rs
similarity index 100%
rename from ui/src/components/mail/accounts/mod.rs
rename to ui/src/components/mail/accounts.rs
diff --git a/ui/src/components/mail/listing/mod.rs b/ui/src/components/mail/listing.rs
similarity index 100%
rename from ui/src/components/mail/listing/mod.rs
rename to ui/src/components/mail/listing.rs
diff --git a/ui/src/components/mail/view/mod.rs b/ui/src/components/mail/view.rs
similarity index 100%
rename from ui/src/components/mail/view/mod.rs
rename to ui/src/components/mail/view.rs
diff --git a/ui/src/conf/mod.rs b/ui/src/conf.rs
similarity index 100%
rename from ui/src/conf/mod.rs
rename to ui/src/conf.rs
diff --git a/ui/src/execute/mod.rs b/ui/src/execute.rs
similarity index 100%
rename from ui/src/execute/mod.rs
rename to ui/src/execute.rs
diff --git a/ui/src/types/mod.rs b/ui/src/types.rs
similarity index 100%
rename from ui/src/types/mod.rs
rename to ui/src/types.rs
diff --git a/ui/src/workers/mod.rs b/ui/src/workers.rs
similarity index 100%
rename from ui/src/workers/mod.rs
rename to ui/src/workers.rs