diff --git a/botcommands/whapp-bridge.go b/botcommands/whapp-bridge.go
index 27be819..2f419be 100644
--- a/botcommands/whapp-bridge.go
+++ b/botcommands/whapp-bridge.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/Rhymen/go-whatsapp"
 	"github.com/hugot/go-deltachat/deltachat"
-	core "github.com/hugot/whapp-deltachat/whappdc-core"
+	"github.com/hugot/whapp-deltachat/core"
 )
 
 func NewWhappBridge(bridgeContext *core.BridgeContext) *WhappBridge {
diff --git a/whappdc-bridge/bridge.go b/bridge/bridge.go
similarity index 93%
rename from whappdc-bridge/bridge.go
rename to bridge/bridge.go
index bb69a08..b725f43 100644
--- a/whappdc-bridge/bridge.go
+++ b/bridge/bridge.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/hugot/go-deltachat/deltabot"
 	"github.com/hugot/whapp-deltachat/botcommands"
+	"github.com/hugot/whapp-deltachat/core"
 	"github.com/hugot/whapp-deltachat/whappdc"
-	core "github.com/hugot/whapp-deltachat/whappdc-core"
 )
 
 type Bridge struct {
diff --git a/whappdc-core/bridge_context.go b/core/bridge_context.go
similarity index 100%
rename from whappdc-core/bridge_context.go
rename to core/bridge_context.go
diff --git a/whappdc-core/config.go b/core/config.go
similarity index 100%
rename from whappdc-core/config.go
rename to core/config.go
diff --git a/whappdc-core/database.go b/core/database.go
similarity index 100%
rename from whappdc-core/database.go
rename to core/database.go
diff --git a/whappdc-core/deltachat.go b/core/deltachat.go
similarity index 100%
rename from whappdc-core/deltachat.go
rename to core/deltachat.go
diff --git a/whappdc-core/whapp.go b/core/whapp.go
similarity index 100%
rename from whappdc-core/whapp.go
rename to core/whapp.go
diff --git a/main.go b/main.go
index 65c2042..f21c4b1 100644
--- a/main.go
+++ b/main.go
@@ -7,8 +7,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	bridge "github.com/hugot/whapp-deltachat/whappdc-bridge"
-	core "github.com/hugot/whapp-deltachat/whappdc-core"
+	bridge "github.com/hugot/whapp-deltachat/bridge"
+	"github.com/hugot/whapp-deltachat/core"
 )
 
 func main() {
diff --git a/whappdc/message_handlers.go b/whappdc/message_handlers.go
index f3e901e..2f1d7a5 100644
--- a/whappdc/message_handlers.go
+++ b/whappdc/message_handlers.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Rhymen/go-whatsapp"
 	"github.com/hugot/go-deltachat/deltachat"
-	core "github.com/hugot/whapp-deltachat/whappdc-core"
+	"github.com/hugot/whapp-deltachat/core"
 )
 
 type MessageHandler struct {
diff --git a/whappdc/message_tracker.go b/whappdc/message_tracker.go
index 56f5c63..2dd85bc 100644
--- a/whappdc/message_tracker.go
+++ b/whappdc/message_tracker.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	core "github.com/hugot/whapp-deltachat/whappdc-core"
+	"github.com/hugot/whapp-deltachat/core"
 )
 
 func NewMessageTracker(DB *core.Database, flushInterval time.Duration) *MessageTracker {
diff --git a/whappdc/whapp_context.go b/whappdc/whapp_context.go
index a9926fb..ea69c54 100644
--- a/whappdc/whapp_context.go
+++ b/whappdc/whapp_context.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/Rhymen/go-whatsapp"
 	"github.com/hugot/go-deltachat/deltachat"
-	core "github.com/hugot/whapp-deltachat/whappdc-core"
+	"github.com/hugot/whapp-deltachat/core"
 )
 
 func NewWhappContext(
diff --git a/whappdc/whapp_handler.go b/whappdc/whapp_handler.go
index c40df0f..d2afe8f 100644
--- a/whappdc/whapp_handler.go
+++ b/whappdc/whapp_handler.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/Rhymen/go-whatsapp"
-	core "github.com/hugot/whapp-deltachat/whappdc-core"
+	"github.com/hugot/whapp-deltachat/core"
 )
 
 // WhappHandler implements go-whaptsapp.Handler