diff --git a/.circleci/config.yml b/.circleci/config.yml
index c387c97..be38030 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,7 +17,7 @@ jobs:
     #### expecting it in the form of
     ####   /go/src/github.com/circleci/go-tool
     ####   /go/src/bitbucket.org/circleci/go-tool
-    working_directory: /go/src/github.com/nbutton23/zxcvbn-go
+    working_directory: /go/src/github.com/status-im/zxcvbn-go
     steps:
       - checkout
       - run: go get -u golang.org/x/lint/golint
diff --git a/adjacency/adjcmartix.go b/adjacency/adjcmartix.go
index 66ad30b..c010a5d 100644
--- a/adjacency/adjcmartix.go
+++ b/adjacency/adjcmartix.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"log"
 
-	"github.com/nbutton23/zxcvbn-go/data"
+	"github.com/status-im/zxcvbn-go/data"
 )
 
 // Graph holds information about different graphs
diff --git a/entropy/entropyCalculator.go b/entropy/entropyCalculator.go
index 8f57ea0..cbdc8db 100644
--- a/entropy/entropyCalculator.go
+++ b/entropy/entropyCalculator.go
@@ -1,9 +1,9 @@
 package entropy
 
 import (
-	"github.com/nbutton23/zxcvbn-go/adjacency"
-	"github.com/nbutton23/zxcvbn-go/match"
-	"github.com/nbutton23/zxcvbn-go/utils/math"
+	"github.com/status-im/zxcvbn-go/adjacency"
+	"github.com/status-im/zxcvbn-go/match"
+	"github.com/status-im/zxcvbn-go/utils/math"
 	"math"
 	"regexp"
 	"unicode"
diff --git a/entropy/entropyCalculator_test.go b/entropy/entropyCalculator_test.go
index 594b9be..b260798 100644
--- a/entropy/entropyCalculator_test.go
+++ b/entropy/entropyCalculator_test.go
@@ -1,7 +1,7 @@
 package entropy
 
 import (
-	"github.com/nbutton23/zxcvbn-go/match"
+	"github.com/status-im/zxcvbn-go/match"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
diff --git a/frequency/frequency.go b/frequency/frequency.go
index d056e4d..9c99ab7 100644
--- a/frequency/frequency.go
+++ b/frequency/frequency.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"log"
 
-	"github.com/nbutton23/zxcvbn-go/data"
+	"github.com/status-im/zxcvbn-go/data"
 )
 
 // List holds a frequency list
diff --git a/fuzz/fuzz.go b/fuzz/fuzz.go
index a8e233c..05512ce 100644
--- a/fuzz/fuzz.go
+++ b/fuzz/fuzz.go
@@ -1,7 +1,7 @@
 package fuzz
 
 import (
-	"github.com/nbutton23/zxcvbn-go"
+	"github.com/status-im/zxcvbn-go"
 )
 
 // Fuzz is used to run https://github.com/dvyukov/go-fuzz
diff --git a/matching/dateMatchers.go b/matching/dateMatchers.go
index 8dfdf24..9c718d1 100644
--- a/matching/dateMatchers.go
+++ b/matching/dateMatchers.go
@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/nbutton23/zxcvbn-go/entropy"
-	"github.com/nbutton23/zxcvbn-go/match"
+	"github.com/status-im/zxcvbn-go/entropy"
+	"github.com/status-im/zxcvbn-go/match"
 )
 
 const (
diff --git a/matching/dictionaryMatch.go b/matching/dictionaryMatch.go
index 4ddb2c3..a9830e8 100644
--- a/matching/dictionaryMatch.go
+++ b/matching/dictionaryMatch.go
@@ -3,8 +3,8 @@ package matching
 import (
 	"strings"
 
-	"github.com/nbutton23/zxcvbn-go/entropy"
-	"github.com/nbutton23/zxcvbn-go/match"
+	"github.com/status-im/zxcvbn-go/entropy"
+	"github.com/status-im/zxcvbn-go/match"
 )
 
 func buildDictMatcher(dictName string, rankedDict map[string]int) func(password string) []match.Match {
diff --git a/matching/leet.go b/matching/leet.go
index 610f197..bc5fc88 100644
--- a/matching/leet.go
+++ b/matching/leet.go
@@ -3,8 +3,8 @@ package matching
 import (
 	"strings"
 
-	"github.com/nbutton23/zxcvbn-go/entropy"
-	"github.com/nbutton23/zxcvbn-go/match"
+	"github.com/status-im/zxcvbn-go/entropy"
+	"github.com/status-im/zxcvbn-go/match"
 )
 
 // L33TMatcherName id
diff --git a/matching/matching.go b/matching/matching.go
index 4577db8..5cea2d8 100644
--- a/matching/matching.go
+++ b/matching/matching.go
@@ -3,9 +3,9 @@ package matching
 import (
 	"sort"
 
-	"github.com/nbutton23/zxcvbn-go/adjacency"
-	"github.com/nbutton23/zxcvbn-go/frequency"
-	"github.com/nbutton23/zxcvbn-go/match"
+	"github.com/status-im/zxcvbn-go/adjacency"
+	"github.com/status-im/zxcvbn-go/frequency"
+	"github.com/status-im/zxcvbn-go/match"
 )
 
 var (
diff --git a/matching/matching_test.go b/matching/matching_test.go
index 9eb07a6..dde9540 100644
--- a/matching/matching_test.go
+++ b/matching/matching_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/nbutton23/zxcvbn-go/match"
+	"github.com/status-im/zxcvbn-go/match"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/matching/repeatMatch.go b/matching/repeatMatch.go
index a93e459..61fd0ed 100644
--- a/matching/repeatMatch.go
+++ b/matching/repeatMatch.go
@@ -3,8 +3,8 @@ package matching
 import (
 	"strings"
 
-	"github.com/nbutton23/zxcvbn-go/entropy"
-	"github.com/nbutton23/zxcvbn-go/match"
+	"github.com/status-im/zxcvbn-go/entropy"
+	"github.com/status-im/zxcvbn-go/match"
 )
 
 const repeatMatcherName = "REPEAT"
diff --git a/matching/sequenceMatch.go b/matching/sequenceMatch.go
index e0ed052..6f5f1a9 100644
--- a/matching/sequenceMatch.go
+++ b/matching/sequenceMatch.go
@@ -3,8 +3,8 @@ package matching
 import (
 	"strings"
 
-	"github.com/nbutton23/zxcvbn-go/entropy"
-	"github.com/nbutton23/zxcvbn-go/match"
+	"github.com/status-im/zxcvbn-go/entropy"
+	"github.com/status-im/zxcvbn-go/match"
 )
 
 const sequenceMatcherName = "SEQ"
diff --git a/matching/spatialMatch.go b/matching/spatialMatch.go
index fd858f5..b6aff70 100644
--- a/matching/spatialMatch.go
+++ b/matching/spatialMatch.go
@@ -3,9 +3,9 @@ package matching
 import (
 	"strings"
 
-	"github.com/nbutton23/zxcvbn-go/adjacency"
-	"github.com/nbutton23/zxcvbn-go/entropy"
-	"github.com/nbutton23/zxcvbn-go/match"
+	"github.com/status-im/zxcvbn-go/adjacency"
+	"github.com/status-im/zxcvbn-go/entropy"
+	"github.com/status-im/zxcvbn-go/match"
 )
 
 const spatialMatcherName = "SPATIAL"
diff --git a/scoring/scoring.go b/scoring/scoring.go
index 4f68a6d..077c5c9 100644
--- a/scoring/scoring.go
+++ b/scoring/scoring.go
@@ -2,9 +2,9 @@ package scoring
 
 import (
 	"fmt"
-	"github.com/nbutton23/zxcvbn-go/entropy"
-	"github.com/nbutton23/zxcvbn-go/match"
-	"github.com/nbutton23/zxcvbn-go/utils/math"
+	"github.com/status-im/zxcvbn-go/entropy"
+	"github.com/status-im/zxcvbn-go/match"
+	"github.com/status-im/zxcvbn-go/utils/math"
 	"math"
 	"sort"
 )
diff --git a/testapp/main.go b/testapp/main.go
index 0eecb14..71d4a01 100644
--- a/testapp/main.go
+++ b/testapp/main.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/nbutton23/zxcvbn-go"
+	"github.com/status-im/zxcvbn-go"
 )
 
 func main() {
diff --git a/zxcvbn.go b/zxcvbn.go
index 9c34b1c..c4b5d72 100644
--- a/zxcvbn.go
+++ b/zxcvbn.go
@@ -3,10 +3,10 @@ package zxcvbn
 import (
 	"time"
 
-	"github.com/nbutton23/zxcvbn-go/match"
-	"github.com/nbutton23/zxcvbn-go/matching"
-	"github.com/nbutton23/zxcvbn-go/scoring"
-	"github.com/nbutton23/zxcvbn-go/utils/math"
+	"github.com/status-im/zxcvbn-go/match"
+	"github.com/status-im/zxcvbn-go/matching"
+	"github.com/status-im/zxcvbn-go/scoring"
+	"github.com/status-im/zxcvbn-go/utils/math"
 )
 
 // PasswordStrength takes a password, userInputs and optional filters and returns a MinEntropyMatch