diff --git a/LICENSE b/LICENSE
index 173c5c9..e064fba 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 speatzle
+Copyright (c) 2021 Samuel Lorch
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 50ecbf6..ea15790 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # go-passbolt
-[![Go Reference](https://pkg.go.dev/badge/github.com/speatzle/go-passbolt.svg)](https://pkg.go.dev/github.com/speatzle/go-passbolt)
+[![Go Reference](https://pkg.go.dev/badge/github.com/passbolt/go-passbolt.svg)](https://pkg.go.dev/github.com/passbolt/go-passbolt)
 
 A Go module to interact with [Passbolt](https://www.passbolt.com/), an open-source password manager for teams
 
-There also is a CLI Tool to interact with Passbolt using this module [here](https://github.com/speatzle/go-passbolt-cli).
+There also is a CLI Tool to interact with Passbolt using this module [here](https://github.com/passbolt/go-passbolt-cli).
 
 This module tries to support the latest Passbolt Community/PRO server release, PRO Features such as folders are supported. Older versions of Passbolt such as v2 are unsupported (it's a password manager, please update it)
 
@@ -15,14 +15,14 @@ The helper package has simplified functions that use the API package to perform
 
 To use the API package, please read the [Passbolt API docs](https://help.passbolt.com/api). Sadly the docs aren't complete so many things here have been found by looking at the source of Passbolt or through trial and error. If you have a question just ask.
 
-PR's are welcome. But be gentle: if it's something bigger or fundamental: please [create an issue](https://github.com/speatzle/go-passbolt/issues/new) and ask first.
+PR's are welcome. But be gentle: if it's something bigger or fundamental: please [create an issue](https://github.com/passbolt/go-passbolt/issues/new) and ask first.
 
 Disclaimer: This project is community driven and not associated with Passbolt SA
 
 
 # Install
 
-`go get github.com/speatzle/go-passbolt`
+`go get github.com/passbolt/go-passbolt`
 
 # Examples
 ## Login
@@ -36,7 +36,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt/api"
+	"github.com/passbolt/go-passbolt/api"
 )
 
 const address = "https://passbolt.example.com"
@@ -70,7 +70,7 @@ You can do this using the `client.CheckSession()` function.
 
 ## Create a Resource
 
-Creating a resource using the helper package is simple. First, add `"github.com/speatzle/go-passbolt/helper"` to your imports.
+Creating a resource using the helper package is simple. First, add `"github.com/passbolt/go-passbolt/helper"` to your imports.
 
 Then you can simply:
 
@@ -331,7 +331,7 @@ go-passbolt now supports MFA! You can set it up using the Client's `MFACallback`
 
 ## Other
 
-These examples are just the main use cases of these Modules, many more API calls are supported. Look at the [reference](https://pkg.go.dev/github.com/speatzle/go-passbolt) for more information.
+These examples are just the main use cases of these Modules, many more API calls are supported. Look at the [reference](https://pkg.go.dev/github.com/passbolt/go-passbolt) for more information.
 
 
 ## Full Example
@@ -350,8 +350,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt/api"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt/api"
+	"github.com/passbolt/go-passbolt/helper"
 )
 
 const address = "https://passbolt.example.com"
diff --git a/go.mod b/go.mod
index 5bf7e9d..6c552cb 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/speatzle/go-passbolt
+module github.com/passbolt/go-passbolt
 
 go 1.16
 
diff --git a/helper/folder.go b/helper/folder.go
index 6243ff0..170edaf 100644
--- a/helper/folder.go
+++ b/helper/folder.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt/api"
+	"github.com/passbolt/go-passbolt/api"
 )
 
 // CreateFolder Creates a new Folder
diff --git a/helper/group.go b/helper/group.go
index 8edffa5..329be41 100644
--- a/helper/group.go
+++ b/helper/group.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt/api"
+	"github.com/passbolt/go-passbolt/api"
 )
 
 // GroupMembershipOperation creates/modifies/deletes a group membership
diff --git a/helper/mfa.go b/helper/mfa.go
index d57623d..0c834c2 100644
--- a/helper/mfa.go
+++ b/helper/mfa.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/speatzle/go-passbolt/api"
+	"github.com/passbolt/go-passbolt/api"
 )
 
 // AddMFACallbackTOTP adds a MFA callback to the client that generates OTP Codes on demand using a Token with configurable retries and delay
diff --git a/helper/resources.go b/helper/resources.go
index 9d0361a..bdfd9ee 100644
--- a/helper/resources.go
+++ b/helper/resources.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt/api"
+	"github.com/passbolt/go-passbolt/api"
 )
 
 // CreateResource Creates a Resource where the Password and Description are Encrypted and Returns the Resources ID
diff --git a/helper/setup.go b/helper/setup.go
index 02c0e50..f82c04b 100644
--- a/helper/setup.go
+++ b/helper/setup.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/speatzle/go-passbolt/api"
+	"github.com/passbolt/go-passbolt/api"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
 	"github.com/ProtonMail/gopenpgp/v2/helper"
diff --git a/helper/setup_test.go b/helper/setup_test.go
index d1f749d..8ec3d2f 100644
--- a/helper/setup_test.go
+++ b/helper/setup_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/speatzle/go-passbolt/api"
+	"github.com/passbolt/go-passbolt/api"
 )
 
 var client *api.Client
diff --git a/helper/share.go b/helper/share.go
index 4365f4c..f28dbbd 100644
--- a/helper/share.go
+++ b/helper/share.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt/api"
+	"github.com/passbolt/go-passbolt/api"
 )
 
 // ShareOperation defines how Resources are to be Shared With Users/Groups
diff --git a/helper/user.go b/helper/user.go
index b7d5723..9327fab 100644
--- a/helper/user.go
+++ b/helper/user.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt/api"
+	"github.com/passbolt/go-passbolt/api"
 )
 
 // CreateUser Creates a new User
diff --git a/helper/util.go b/helper/util.go
index 5dd8300..78b1960 100644
--- a/helper/util.go
+++ b/helper/util.go
@@ -3,7 +3,7 @@ package helper
 import (
 	"fmt"
 
-	"github.com/speatzle/go-passbolt/api"
+	"github.com/passbolt/go-passbolt/api"
 )
 
 func getPublicKeyByUserID(userID string, Users []api.User) (string, error) {