diff --git a/main.go b/main.go
index 3ed51978..ec86d033 100644
--- a/main.go
+++ b/main.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/evilsocket/bettercap-ng/core"
+	"github.com/evilsocket/bettercap-ng/modules"
 	"github.com/evilsocket/bettercap-ng/session"
-	"github.com/evilsocket/bettercap-ng/session/modules"
 )
 
 var sess *session.Session
diff --git a/session/modules/api_rest.go b/modules/api_rest.go
similarity index 100%
rename from session/modules/api_rest.go
rename to modules/api_rest.go
diff --git a/session/modules/api_rest_routes.go b/modules/api_rest_routes.go
similarity index 100%
rename from session/modules/api_rest_routes.go
rename to modules/api_rest_routes.go
diff --git a/session/modules/arp_spoof.go b/modules/arp_spoof.go
similarity index 100%
rename from session/modules/arp_spoof.go
rename to modules/arp_spoof.go
diff --git a/session/modules/events_stream.go b/modules/events_stream.go
similarity index 100%
rename from session/modules/events_stream.go
rename to modules/events_stream.go
diff --git a/session/modules/http_proxy.go b/modules/http_proxy.go
similarity index 100%
rename from session/modules/http_proxy.go
rename to modules/http_proxy.go
diff --git a/session/modules/http_proxy_js_request.go b/modules/http_proxy_js_request.go
similarity index 100%
rename from session/modules/http_proxy_js_request.go
rename to modules/http_proxy_js_request.go
diff --git a/session/modules/http_proxy_js_response.go b/modules/http_proxy_js_response.go
similarity index 100%
rename from session/modules/http_proxy_js_response.go
rename to modules/http_proxy_js_response.go
diff --git a/session/modules/http_proxy_script.go b/modules/http_proxy_script.go
similarity index 100%
rename from session/modules/http_proxy_script.go
rename to modules/http_proxy_script.go
diff --git a/session/modules/net_probe.go b/modules/net_probe.go
similarity index 100%
rename from session/modules/net_probe.go
rename to modules/net_probe.go
diff --git a/session/modules/net_recon.go b/modules/net_recon.go
similarity index 100%
rename from session/modules/net_recon.go
rename to modules/net_recon.go
diff --git a/session/modules/net_sniff.go b/modules/net_sniff.go
similarity index 100%
rename from session/modules/net_sniff.go
rename to modules/net_sniff.go
diff --git a/session/modules/.discovery.go.swp b/session/modules/.discovery.go.swp
deleted file mode 100644
index e6e3fbc0..00000000
Binary files a/session/modules/.discovery.go.swp and /dev/null differ