diff --git a/examples/repl/cmdline.rs b/examples/repl/cmdline.rs
index 215e4d5d7..eae0dfe68 100644
--- a/examples/repl/cmdline.rs
+++ b/examples/repl/cmdline.rs
@@ -1,46 +1,24 @@
 use std::ffi::{CStr, CString};
-use std::sync::{Arc, RwLock};
 
 use deltachat::constants::*;
-use deltachat::dc_aheader::*;
 use deltachat::dc_array::*;
 use deltachat::dc_chat::*;
 use deltachat::dc_chatlist::*;
 use deltachat::dc_configure::*;
 use deltachat::dc_contact::*;
 use deltachat::dc_context::*;
-use deltachat::dc_dehtml::*;
-use deltachat::dc_e2ee::*;
-use deltachat::dc_imap::*;
 use deltachat::dc_imex::*;
 use deltachat::dc_job::*;
-use deltachat::dc_jobthread::*;
-use deltachat::dc_key::*;
-use deltachat::dc_keyhistory::*;
-use deltachat::dc_keyring::*;
 use deltachat::dc_location::*;
 use deltachat::dc_log::*;
-use deltachat::dc_loginparam::*;
 use deltachat::dc_lot::*;
-use deltachat::dc_mimefactory::*;
-use deltachat::dc_mimeparser::*;
-use deltachat::dc_move::*;
 use deltachat::dc_msg::*;
-use deltachat::dc_param::*;
-use deltachat::dc_pgp::*;
 use deltachat::dc_qr::*;
 use deltachat::dc_receive_imf::*;
-use deltachat::dc_saxparser::*;
 use deltachat::dc_securejoin::*;
-use deltachat::dc_simplify::*;
-use deltachat::dc_smtp::*;
 use deltachat::dc_sqlite3::*;
-use deltachat::dc_stock::*;
 use deltachat::dc_strbuilder::*;
-use deltachat::dc_strencode::*;
-use deltachat::dc_token::*;
 use deltachat::dc_tools::*;
-use deltachat::oauth2::*;
 use deltachat::peerstate::*;
 use deltachat::types::*;
 use deltachat::x::*;
diff --git a/examples/repl/main.rs b/examples/repl/main.rs
index 0ae30285a..ac8aaa189 100644
--- a/examples/repl/main.rs
+++ b/examples/repl/main.rs
@@ -6,7 +6,6 @@
 //! all further options can be set using the set-command (type ? for help).
 
 #![allow(
-    unused_imports,
     mutable_transmutes,
     non_camel_case_types,
     non_snake_case,
@@ -21,50 +20,16 @@ use std::io::{self, Write};
 use std::sync::{Arc, RwLock};
 
 use deltachat::constants::*;
-use deltachat::dc_aheader::*;
-use deltachat::dc_array::*;
-use deltachat::dc_chat::*;
-use deltachat::dc_chatlist::*;
 use deltachat::dc_configure::*;
-use deltachat::dc_contact::*;
 use deltachat::dc_context::*;
-use deltachat::dc_dehtml::*;
-use deltachat::dc_e2ee::*;
-use deltachat::dc_imap::*;
-use deltachat::dc_imex::*;
 use deltachat::dc_job::*;
-use deltachat::dc_jobthread::*;
-use deltachat::dc_key::*;
-use deltachat::dc_keyhistory::*;
-use deltachat::dc_keyring::*;
-use deltachat::dc_location::*;
-use deltachat::dc_log::*;
-use deltachat::dc_loginparam::*;
-use deltachat::dc_lot::*;
-use deltachat::dc_mimefactory::*;
-use deltachat::dc_mimeparser::*;
-use deltachat::dc_move::*;
-use deltachat::dc_msg::*;
-use deltachat::dc_param::*;
-use deltachat::dc_pgp::*;
-use deltachat::dc_qr::*;
-use deltachat::dc_receive_imf::*;
-use deltachat::dc_saxparser::*;
 use deltachat::dc_securejoin::*;
-use deltachat::dc_simplify::*;
-use deltachat::dc_smtp::*;
-use deltachat::dc_sqlite3::*;
-use deltachat::dc_stock::*;
-use deltachat::dc_strbuilder::*;
-use deltachat::dc_strencode::*;
-use deltachat::dc_token::*;
 use deltachat::dc_tools::*;
 use deltachat::oauth2::*;
-use deltachat::peerstate::*;
 use deltachat::types::*;
 use deltachat::x::*;
-mod cmdline;
 
+mod cmdline;
 use self::cmdline::*;
 
 /* ******************************************************************************
diff --git a/src/dc_aheader.rs b/src/aheader.rs
similarity index 99%
rename from src/dc_aheader.rs
rename to src/aheader.rs
index 97c69f996..180077a0a 100644
--- a/src/dc_aheader.rs
+++ b/src/aheader.rs
@@ -7,7 +7,7 @@ use mmime::mailimf_types::*;
 
 use crate::constants::*;
 use crate::dc_contact::*;
-use crate::dc_key::*;
+use crate::key::*;
 
 /// Possible values for encryption preference
 #[derive(PartialEq, Eq, Debug, Clone, Copy, FromPrimitive, ToPrimitive)]
diff --git a/src/dc_configure.rs b/src/dc_configure.rs
index 1765bd79f..4fdacdcda 100644
--- a/src/dc_configure.rs
+++ b/src/dc_configure.rs
@@ -1,7 +1,6 @@
 use crate::constants::Event;
 use crate::dc_context::dc_context_t;
 use crate::dc_e2ee::*;
-use crate::dc_imap::*;
 use crate::dc_job::*;
 use crate::dc_log::*;
 use crate::dc_loginparam::*;
@@ -9,6 +8,7 @@ use crate::dc_saxparser::*;
 use crate::dc_sqlite3::*;
 use crate::dc_strencode::*;
 use crate::dc_tools::*;
+use crate::imap::*;
 use crate::oauth2::*;
 use crate::types::*;
 use crate::x::*;
diff --git a/src/dc_contact.rs b/src/dc_contact.rs
index c26eeacd8..9a3f25644 100644
--- a/src/dc_contact.rs
+++ b/src/dc_contact.rs
@@ -1,16 +1,16 @@
+use crate::aheader::EncryptPreference;
 use crate::constants::Event;
-use crate::dc_aheader::EncryptPreference;
 use crate::dc_array::*;
 use crate::dc_context::dc_context_t;
 use crate::dc_context::*;
 use crate::dc_e2ee::*;
-use crate::dc_key::*;
 use crate::dc_log::*;
 use crate::dc_loginparam::*;
 use crate::dc_sqlite3::*;
 use crate::dc_stock::*;
 use crate::dc_strbuilder::*;
 use crate::dc_tools::*;
+use crate::key::*;
 use crate::peerstate::*;
 use crate::types::*;
 use crate::x::*;
diff --git a/src/dc_context.rs b/src/dc_context.rs
index b99656390..88ad69310 100644
--- a/src/dc_context.rs
+++ b/src/dc_context.rs
@@ -4,21 +4,21 @@ use crate::constants::*;
 use crate::dc_array::*;
 use crate::dc_chat::*;
 use crate::dc_contact::*;
-use crate::dc_imap::*;
 use crate::dc_job::*;
 use crate::dc_jobthread::*;
-use crate::dc_key::*;
 use crate::dc_log::*;
 use crate::dc_loginparam::*;
 use crate::dc_lot::dc_lot_t;
 use crate::dc_move::*;
 use crate::dc_msg::*;
 use crate::dc_receive_imf::*;
-use crate::dc_smtp::*;
 use crate::dc_sqlite3::*;
 use crate::dc_stock::*;
 use crate::dc_strbuilder::*;
 use crate::dc_tools::*;
+use crate::imap::*;
+use crate::key::*;
+use crate::smtp::*;
 use crate::types::*;
 use crate::x::*;
 
diff --git a/src/dc_e2ee.rs b/src/dc_e2ee.rs
index 31bc9b753..b45b0161d 100644
--- a/src/dc_e2ee.rs
+++ b/src/dc_e2ee.rs
@@ -15,17 +15,17 @@ use mmime::mailprivacy_prepare_mime;
 use mmime::mmapstring::*;
 use mmime::{mailmime_substitute, MAILIMF_NO_ERROR, MAIL_NO_ERROR};
 
-use crate::dc_aheader::*;
+use crate::aheader::*;
 use crate::dc_context::dc_context_t;
-use crate::dc_key::*;
 use crate::dc_keyring::*;
 use crate::dc_log::*;
 use crate::dc_mimeparser::*;
-use crate::dc_pgp::*;
 use crate::dc_securejoin::*;
 use crate::dc_sqlite3::*;
 use crate::dc_tools::*;
+use crate::key::*;
 use crate::peerstate::*;
+use crate::pgp::*;
 use crate::types::*;
 use crate::x::*;
 
diff --git a/src/dc_imex.rs b/src/dc_imex.rs
index 0abb39df2..b10b44ba3 100644
--- a/src/dc_imex.rs
+++ b/src/dc_imex.rs
@@ -11,16 +11,16 @@ use crate::dc_configure::*;
 use crate::dc_context::dc_context_t;
 use crate::dc_e2ee::*;
 use crate::dc_job::*;
-use crate::dc_key::*;
 use crate::dc_log::*;
 use crate::dc_loginparam::*;
 use crate::dc_msg::*;
 use crate::dc_param::*;
-use crate::dc_pgp::*;
 use crate::dc_sqlite3::*;
 use crate::dc_stock::*;
 use crate::dc_strbuilder::*;
 use crate::dc_tools::*;
+use crate::key::*;
+use crate::pgp::*;
 use crate::types::*;
 use crate::x::*;
 
diff --git a/src/dc_job.rs b/src/dc_job.rs
index 8909c28ee..d62f6f1e1 100644
--- a/src/dc_job.rs
+++ b/src/dc_job.rs
@@ -9,7 +9,6 @@ use crate::constants::Event;
 use crate::dc_chat::*;
 use crate::dc_configure::*;
 use crate::dc_context::dc_context_t;
-use crate::dc_imap::*;
 use crate::dc_imex::*;
 use crate::dc_jobthread::*;
 use crate::dc_keyhistory::*;
@@ -21,6 +20,7 @@ use crate::dc_msg::*;
 use crate::dc_param::*;
 use crate::dc_sqlite3::*;
 use crate::dc_tools::*;
+use crate::imap::*;
 use crate::types::*;
 use crate::x::*;
 
diff --git a/src/dc_jobthread.rs b/src/dc_jobthread.rs
index 941144126..324575929 100644
--- a/src/dc_jobthread.rs
+++ b/src/dc_jobthread.rs
@@ -2,10 +2,10 @@ use std::sync::{Arc, Condvar, Mutex};
 
 use crate::dc_configure::*;
 use crate::dc_context::dc_context_t;
-use crate::dc_imap::Imap;
 use crate::dc_log::*;
 use crate::dc_sqlite3::*;
 use crate::dc_tools::*;
+use crate::imap::Imap;
 use crate::x::*;
 
 #[repr(C)]
diff --git a/src/dc_keyring.rs b/src/dc_keyring.rs
index ff28187f0..321bf9356 100644
--- a/src/dc_keyring.rs
+++ b/src/dc_keyring.rs
@@ -2,8 +2,8 @@ use std::borrow::Cow;
 
 use crate::constants::*;
 use crate::dc_context::dc_context_t;
-use crate::dc_key::*;
 use crate::dc_sqlite3::*;
+use crate::key::*;
 use crate::types::*;
 
 #[derive(Default, Clone, Debug)]
diff --git a/src/dc_msg.rs b/src/dc_msg.rs
index 786131fb9..a43be3ebe 100644
--- a/src/dc_msg.rs
+++ b/src/dc_msg.rs
@@ -7,11 +7,11 @@ use crate::dc_log::*;
 use crate::dc_lot::dc_lot_t;
 use crate::dc_lot::*;
 use crate::dc_param::*;
-use crate::dc_pgp::*;
 use crate::dc_sqlite3::*;
 use crate::dc_stock::*;
 use crate::dc_strbuilder::*;
 use crate::dc_tools::*;
+use crate::pgp::*;
 use crate::types::*;
 use crate::x::*;
 
diff --git a/src/dc_qr.rs b/src/dc_qr.rs
index 027fd3b01..504575981 100644
--- a/src/dc_qr.rs
+++ b/src/dc_qr.rs
@@ -1,12 +1,12 @@
 use crate::dc_chat::*;
 use crate::dc_contact::*;
 use crate::dc_context::dc_context_t;
-use crate::dc_key::*;
 use crate::dc_log::*;
 use crate::dc_lot::*;
 use crate::dc_param::*;
 use crate::dc_strencode::*;
 use crate::dc_tools::*;
+use crate::key::*;
 use crate::peerstate::*;
 use crate::types::*;
 use crate::x::*;
diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs
index 092fbaa2f..ff1831b81 100644
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -18,7 +18,6 @@ use crate::dc_mimeparser::*;
 use crate::dc_move::*;
 use crate::dc_msg::*;
 use crate::dc_param::*;
-use crate::dc_pgp::dc_hash_sha256;
 use crate::dc_securejoin::*;
 use crate::dc_sqlite3::*;
 use crate::dc_stock::*;
@@ -26,6 +25,7 @@ use crate::dc_strbuilder::*;
 use crate::dc_strencode::*;
 use crate::dc_tools::*;
 use crate::peerstate::*;
+use crate::pgp::dc_hash_sha256;
 use crate::types::*;
 use crate::x::*;
 
diff --git a/src/dc_securejoin.rs b/src/dc_securejoin.rs
index e599a3b72..2c2054c61 100644
--- a/src/dc_securejoin.rs
+++ b/src/dc_securejoin.rs
@@ -1,14 +1,13 @@
 use mmime::mailimf_types::*;
 
+use crate::aheader::EncryptPreference;
 use crate::constants::Event;
-use crate::dc_aheader::EncryptPreference;
 use crate::dc_array::*;
 use crate::dc_chat::*;
 use crate::dc_configure::*;
 use crate::dc_contact::*;
 use crate::dc_context::dc_context_t;
 use crate::dc_e2ee::*;
-use crate::dc_key::*;
 use crate::dc_log::*;
 use crate::dc_lot::*;
 use crate::dc_mimeparser::*;
@@ -20,6 +19,7 @@ use crate::dc_stock::*;
 use crate::dc_strencode::*;
 use crate::dc_token::*;
 use crate::dc_tools::*;
+use crate::key::*;
 use crate::peerstate::*;
 use crate::types::*;
 use crate::x::*;
diff --git a/src/dc_imap.rs b/src/imap.rs
similarity index 100%
rename from src/dc_imap.rs
rename to src/imap.rs
diff --git a/src/dc_key.rs b/src/key.rs
similarity index 99%
rename from src/dc_key.rs
rename to src/key.rs
index af3fba42c..cfbc82d3b 100644
--- a/src/dc_key.rs
+++ b/src/key.rs
@@ -455,7 +455,7 @@ mod tests {
     #[test]
     fn test_from_slice_roundtrip() {
         let (public_key, private_key) =
-            crate::dc_pgp::dc_pgp_create_keypair(CString::new("hello").unwrap().as_ptr()).unwrap();
+            crate::pgp::dc_pgp_create_keypair(CString::new("hello").unwrap().as_ptr()).unwrap();
 
         let binary = public_key.to_bytes();
         let public_key2 = Key::from_slice(&binary, KeyType::Public).expect("invalid public key");
diff --git a/src/lib.rs b/src/lib.rs
index 5cdab0454..a987e5b0a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -22,27 +22,29 @@ extern crate smallvec;
 #[macro_use]
 pub mod dc_log;
 
+pub mod aheader;
+pub mod constants;
+pub mod imap;
+pub mod key;
 pub mod oauth2;
 pub mod peerstate;
+pub mod pgp;
+pub mod smtp;
 pub mod types;
 pub mod x;
 
-pub mod constants;
+pub mod dc_context;
 
-pub mod dc_aheader;
 pub mod dc_array;
 pub mod dc_chat;
 pub mod dc_chatlist;
 pub mod dc_configure;
 pub mod dc_contact;
-pub mod dc_context;
 pub mod dc_dehtml;
 pub mod dc_e2ee;
-pub mod dc_imap;
 pub mod dc_imex;
 pub mod dc_job;
 pub mod dc_jobthread;
-pub mod dc_key;
 pub mod dc_keyhistory;
 pub mod dc_keyring;
 pub mod dc_location;
@@ -53,13 +55,11 @@ pub mod dc_mimeparser;
 pub mod dc_move;
 pub mod dc_msg;
 pub mod dc_param;
-pub mod dc_pgp;
 pub mod dc_qr;
 pub mod dc_receive_imf;
 pub mod dc_saxparser;
 pub mod dc_securejoin;
 pub mod dc_simplify;
-pub mod dc_smtp;
 pub mod dc_sqlite3;
 pub mod dc_stock;
 pub mod dc_strbuilder;
diff --git a/src/peerstate.rs b/src/peerstate.rs
index 2b5a6c37d..88d802fbb 100644
--- a/src/peerstate.rs
+++ b/src/peerstate.rs
@@ -3,13 +3,13 @@ use std::ffi::CString;
 
 use num_traits::FromPrimitive;
 
+use crate::aheader::*;
 use crate::constants::*;
-use crate::dc_aheader::*;
 use crate::dc_chat::*;
 use crate::dc_context::dc_context_t;
-use crate::dc_key::*;
 use crate::dc_sqlite3::*;
 use crate::dc_tools::{to_cstring, to_string};
+use crate::key::*;
 use crate::types::*;
 
 /// Peerstate represents the state of an Autocrypt peer.
diff --git a/src/dc_pgp.rs b/src/pgp.rs
similarity index 99%
rename from src/dc_pgp.rs
rename to src/pgp.rs
index 0b91550c6..8d1f83bad 100644
--- a/src/dc_pgp.rs
+++ b/src/pgp.rs
@@ -12,9 +12,9 @@ use pgp::types::{CompressionAlgorithm, KeyTrait, SecretKeyTrait, StringToKey};
 use rand::thread_rng;
 use sha2::{Digest, Sha256};
 
-use crate::dc_key::*;
 use crate::dc_keyring::*;
 use crate::dc_tools::*;
+use crate::key::*;
 use crate::types::*;
 use crate::x::*;
 
diff --git a/src/dc_smtp.rs b/src/smtp.rs
similarity index 100%
rename from src/dc_smtp.rs
rename to src/smtp.rs
diff --git a/tests/stress.rs b/tests/stress.rs
index ecb0daa0e..6e59a7b8d 100644
--- a/tests/stress.rs
+++ b/tests/stress.rs
@@ -11,20 +11,20 @@ use deltachat::dc_array::*;
 use deltachat::dc_configure::*;
 use deltachat::dc_context::*;
 use deltachat::dc_imex::*;
-use deltachat::dc_key::*;
 use deltachat::dc_keyring::*;
 use deltachat::dc_location::*;
 use deltachat::dc_lot::*;
 use deltachat::dc_mimeparser::*;
 use deltachat::dc_param::*;
-use deltachat::dc_pgp::*;
 use deltachat::dc_qr::*;
 use deltachat::dc_saxparser::*;
 use deltachat::dc_securejoin::*;
 use deltachat::dc_strbuilder::*;
 use deltachat::dc_strencode::*;
 use deltachat::dc_tools::*;
+use deltachat::key::*;
 use deltachat::oauth2::*;
+use deltachat::pgp::*;
 use deltachat::types::*;
 use deltachat::x::*;
 use libc;