diff --git a/README.md b/README.md
index 59f41e5..864ccb4 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # wifictld-analyzer
-[![Build Status](https://dev.sum7.eu/genofire/wifictld-analyzer/badges/master/build.svg)](https://dev.sum7.eu/genofire/wifictld-analyzer/pipelines)
-[![Go Report Card](https://goreportcard.com/badge/dev.sum7.eu/genofire/wifictld-analyzer)](https://goreportcard.com/report/dev.sum7.eu/genofire/wifictld-analyzer)
-[![GoDoc](https://godoc.org/dev.sum7.eu/genofire/wifictld-analyzer?status.svg)](https://godoc.org/dev.sum7.eu/genofire/wifictld-analyzer)
+[![Build Status](https://dev.sum7.eu/wifictld/wifictld-analyzer/badges/master/build.svg)](https://dev.sum7.eu/genofire/wifictld-analyzer/pipelines)
+[![Go Report Card](https://goreportcard.com/badge/dev.sum7.eu/wifictld/wifictld-analyzer)](https://goreportcard.com/report/dev.sum7.eu/genofire/wifictld-analyzer)
+[![GoDoc](https://godoc.org/dev.sum7.eu/wifictld/wifictld-analyzer?status.svg)](https://godoc.org/dev.sum7.eu/genofire/wifictld-analyzer)
 
 
 ## Get wifictld-analyzer
@@ -10,14 +10,14 @@
 
 Latest Build binary from ci here:
 
-[Download All](https://dev.sum7.eu/genofire/wifictld-analyzer/-/jobs/artifacts/master/download/?job=build-my-project) (with config example)
+[Download All](https://dev.sum7.eu/wifictld/wifictld-analyzer/-/jobs/artifacts/master/download/?job=build-my-project) (with config example)
 
-[Download Binary](https://dev.sum7.eu/genofire/wifictld-analyzer/-/jobs/artifacts/master/raw/wifictld-analyzer?inline=false&job=build-my-project)
+[Download Binary](https://dev.sum7.eu/wifictld/wifictld-analyzer/-/jobs/artifacts/master/raw/wifictld-analyzer?inline=false&job=build-my-project)
 
 #### Build
 
 ```bash
-go get -u dev.sum7.eu/genofire/wifictld-analyzer
+go get -u dev.sum7.eu/wifictld/wifictld-analyzer
 ```
 
 ## Configure
diff --git a/capture/socket_msg.go b/capture/socket_msg.go
index d199a92..571da0e 100644
--- a/capture/socket_msg.go
+++ b/capture/socket_msg.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/bdlm/log"
 
-	"dev.sum7.eu/genofire/wifictld-analyzer/data"
+	"dev.sum7.eu/wifictld/wifictld-analyzer/data"
 )
 
 var DEBUG = false
diff --git a/capture/wifi_client.go b/capture/wifi_client.go
index 92895e2..2917e67 100644
--- a/capture/wifi_client.go
+++ b/capture/wifi_client.go
@@ -3,7 +3,7 @@ package capture
 import (
 	"time"
 
-	"dev.sum7.eu/genofire/wifictld-analyzer/data"
+	"dev.sum7.eu/wifictld/wifictld-analyzer/data"
 )
 
 // WifiClient datatype of wifictld
diff --git a/cmd/controller.go b/cmd/controller.go
index 513b58f..e7cbbd2 100644
--- a/cmd/controller.go
+++ b/cmd/controller.go
@@ -11,9 +11,9 @@ import (
 	"github.com/bdlm/log"
 	"github.com/spf13/cobra"
 
-	"dev.sum7.eu/genofire/wifictld-analyzer/capture"
-	"dev.sum7.eu/genofire/wifictld-analyzer/controller"
-	"dev.sum7.eu/genofire/wifictld-analyzer/web"
+	"dev.sum7.eu/wifictld/wifictld-analyzer/capture"
+	"dev.sum7.eu/wifictld/wifictld-analyzer/controller"
+	"dev.sum7.eu/wifictld/wifictld-analyzer/web"
 )
 
 type ControllerConfig struct {
diff --git a/cmd/dump.go b/cmd/dump.go
index 20381c5..f2aaacd 100644
--- a/cmd/dump.go
+++ b/cmd/dump.go
@@ -10,7 +10,7 @@ import (
 	"github.com/bdlm/log"
 	"github.com/spf13/cobra"
 
-	"dev.sum7.eu/genofire/wifictld-analyzer/capture"
+	"dev.sum7.eu/wifictld/wifictld-analyzer/capture"
 )
 
 var (
diff --git a/controller/handler.go b/controller/handler.go
index b930f39..45561f4 100644
--- a/controller/handler.go
+++ b/controller/handler.go
@@ -7,8 +7,8 @@ import (
 	// "github.com/bdlm/log"
 	"dev.sum7.eu/genofire/golang-lib/database"
 
-	"dev.sum7.eu/genofire/wifictld-analyzer/capture"
-	"dev.sum7.eu/genofire/wifictld-analyzer/data"
+	"dev.sum7.eu/wifictld/wifictld-analyzer/capture"
+	"dev.sum7.eu/wifictld/wifictld-analyzer/data"
 )
 
 func (c *Controller) Handler(addr *net.UDPAddr, msg *capture.SocketMSG) (*capture.SocketMSG, error) {
diff --git a/controller/learn.go b/controller/learn.go
index a1384f5..fecb8b3 100644
--- a/controller/learn.go
+++ b/controller/learn.go
@@ -7,8 +7,8 @@ import (
 	// "github.com/bdlm/log"
 	"dev.sum7.eu/genofire/golang-lib/database"
 
-	"dev.sum7.eu/genofire/wifictld-analyzer/capture"
-	"dev.sum7.eu/genofire/wifictld-analyzer/data"
+	"dev.sum7.eu/wifictld/wifictld-analyzer/capture"
+	"dev.sum7.eu/wifictld/wifictld-analyzer/data"
 )
 
 func (c *Controller) LearnClient(apIP net.IP, clientWifictl *capture.WifiClient) bool {
diff --git a/controller/main.go b/controller/main.go
index 80a7281..3fbbe7f 100644
--- a/controller/main.go
+++ b/controller/main.go
@@ -7,8 +7,8 @@ import (
 	"dev.sum7.eu/genofire/golang-lib/database"
 	"github.com/bdlm/log"
 
-	"dev.sum7.eu/genofire/wifictld-analyzer/capture"
-	"dev.sum7.eu/genofire/wifictld-analyzer/data"
+	"dev.sum7.eu/wifictld/wifictld-analyzer/capture"
+	"dev.sum7.eu/wifictld/wifictld-analyzer/data"
 )
 
 type Controller struct {
diff --git a/main.go b/main.go
index 7b30dd2..f72c463 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,6 @@
 package main
 
-import "dev.sum7.eu/genofire/wifictld-analyzer/cmd"
+import "dev.sum7.eu/wifictld/wifictld-analyzer/cmd"
 
 func main() {
 	cmd.Execute()
diff --git a/web/webserver.go b/web/webserver.go
index b1f301e..dd121b6 100644
--- a/web/webserver.go
+++ b/web/webserver.go
@@ -11,8 +11,8 @@ import (
 	lib "dev.sum7.eu/genofire/golang-lib/http"
 	"dev.sum7.eu/genofire/golang-lib/websocket"
 
-	"dev.sum7.eu/genofire/wifictld-analyzer/capture"
-	"dev.sum7.eu/genofire/wifictld-analyzer/data"
+	"dev.sum7.eu/wifictld/wifictld-analyzer/capture"
+	"dev.sum7.eu/wifictld/wifictld-analyzer/data"
 )
 
 type Server struct {