diff --git a/README.md b/README.md
index fd0e0db..2ad5ce3 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This repository is tailored to small private servers, where you own a domain and
 
 The setup is modular and so far has (more to come, feel free to contribute :)
 
-* `email_core` -  base SMTP and IMAP server
+* `core` -  base SMTP and IMAP server
 * `opendkim` - adds DKIM signing service to the core
 * `amavis` - adds incoming SPAM filter
 
diff --git a/email_core/Dockerfile b/core/Dockerfile
similarity index 100%
rename from email_core/Dockerfile
rename to core/Dockerfile
diff --git a/email_core/README.md b/core/README.md
similarity index 100%
rename from email_core/README.md
rename to core/README.md
diff --git a/email_core/boot b/core/boot
similarity index 100%
rename from email_core/boot
rename to core/boot
diff --git a/email_core/boot.d/amavis b/core/boot.d/amavis
similarity index 100%
rename from email_core/boot.d/amavis
rename to core/boot.d/amavis
diff --git a/email_core/boot.d/opendkim b/core/boot.d/opendkim
similarity index 100%
rename from email_core/boot.d/opendkim
rename to core/boot.d/opendkim
diff --git a/email_core/config/dovecot.auth b/core/config/dovecot.auth
similarity index 100%
rename from email_core/config/dovecot.auth
rename to core/config/dovecot.auth
diff --git a/email_core/config/dovecot.imap b/core/config/dovecot.imap
similarity index 100%
rename from email_core/config/dovecot.imap
rename to core/config/dovecot.imap
diff --git a/email_core/config/dovecot.lda b/core/config/dovecot.lda
similarity index 100%
rename from email_core/config/dovecot.lda
rename to core/config/dovecot.lda
diff --git a/email_core/config/dovecot.logging b/core/config/dovecot.logging
similarity index 100%
rename from email_core/config/dovecot.logging
rename to core/config/dovecot.logging
diff --git a/email_core/config/dovecot.mail b/core/config/dovecot.mail
similarity index 100%
rename from email_core/config/dovecot.mail
rename to core/config/dovecot.mail
diff --git a/email_core/config/dovecot.master b/core/config/dovecot.master
similarity index 100%
rename from email_core/config/dovecot.master
rename to core/config/dovecot.master
diff --git a/email_core/config/dovecot.ssl b/core/config/dovecot.ssl
similarity index 100%
rename from email_core/config/dovecot.ssl
rename to core/config/dovecot.ssl
diff --git a/email_core/config/example/aliases b/core/config/example/aliases
similarity index 100%
rename from email_core/config/example/aliases
rename to core/config/example/aliases
diff --git a/email_core/config/example/domains b/core/config/example/domains
similarity index 100%
rename from email_core/config/example/domains
rename to core/config/example/domains
diff --git a/email_core/config/example/myhostname b/core/config/example/myhostname
similarity index 100%
rename from email_core/config/example/myhostname
rename to core/config/example/myhostname
diff --git a/email_core/config/example/passwords b/core/config/example/passwords
similarity index 100%
rename from email_core/config/example/passwords
rename to core/config/example/passwords
diff --git a/email_core/config/postfix.main.cf b/core/config/postfix.main.cf
similarity index 100%
rename from email_core/config/postfix.main.cf
rename to core/config/postfix.main.cf
diff --git a/email_core/config/postfix.master.cf.append b/core/config/postfix.master.cf.append
similarity index 100%
rename from email_core/config/postfix.master.cf.append
rename to core/config/postfix.master.cf.append
diff --git a/email_core/config/rsyslog.conf b/core/config/rsyslog.conf
similarity index 100%
rename from email_core/config/rsyslog.conf
rename to core/config/rsyslog.conf
diff --git a/docker-compose.yml b/docker-compose.yml
index bf5de4c..cda51d9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,5 @@
-emailcore:
-  build: ./email_core
+core:
+  build: ./core
   ports:
     - "25:25"
     - "143:143"