diff --git a/.gitignore b/.gitignore
index e31e48a42..0ecad1b93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ dist/
 *.tgz
 
 # Specific files
+/configuration.yml
 /config.yml
 /config.test.yml
 
diff --git a/.travis.yml b/.travis.yml
index 537e196bb..b3fa1d7aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -98,7 +98,7 @@ jobs:
       after_success:
         - authelia-scripts docker push-image --arch=$ARCH
       before_deploy:
-        - docker create --name authelia-binary clems4ever/authelia:${TRAVIS_TAG:1}-$ARCH
+        - docker create --name authelia-binary authelia/authelia:${TRAVIS_TAG:1}-$ARCH
         - docker cp authelia-binary:/usr/app/authelia ./authelia-linux-$ARCH
         - docker cp authelia-binary:/usr/app/public_html ./
         - tar -czf authelia-linux-$ARCH.tar.gz authelia-linux-$ARCH public_html
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b4a39ba0..d8eda0dbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@ Release Notes - Version 4.0.0
 ------------------------------
 * Authelia is rewritten in Go.
 * Authelia frontend has been rewritten with Material-UI and simplified.
-* config.yml should include a secret for jwt issuance and verification.
+* configuration.yml should include a secret for jwt issuance and verification.
 * Models in database have been updated to better fit with the Go library.
 * The local storage has been replaced by a good old sqlite3 database.
 * The mongo option for storing user preferences and device secrets has been deprecated in favor of SQL options: mysql and postgres.
diff --git a/README.md b/README.md
index d4bfd1289..c86d88238 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 </p>
 
   [![license](https://img.shields.io/badge/license-Apache%202.0-green.svg)][Apache 2.0]
-  [![Build](https://travis-ci.org/clems4ever/authelia.svg?branch=master)](https://travis-ci.org/clems4ever/authelia)
+  [![Build](https://travis-ci.org/authelia/authelia.svg?branch=master)](https://travis-ci.org/authelia/authelia)
   [![Gitter](https://img.shields.io/gitter/room/badges/shields.svg)](https://gitter.im/authelia/general?utm_source=share-link&utm_medium=link&utm_campaign=share-link)
 
 **Authelia** is an open-source authentication and authorization server
@@ -57,7 +57,7 @@ For more details about the features, follow [Features](./docs/features.md).
 ## Proxy support
 
 Authelia works in combination with [nginx] or [Traefik] and soon with [HAProxy] as discussed in
-[#271](https://github.com/clems4ever/authelia/issues/271). It can be deployed on bare metal with
+[#271](https://github.com/authelia/authelia/issues/271). It can be deployed on bare metal with
 Docker or directly in [Kubernetes].
 
 <p align="center">
@@ -70,7 +70,7 @@ Docker or directly in [Kubernetes].
 
 You can start off with
 
-    git clone https://github.com/clems4ever/authelia.git && cd authelia
+    git clone https://github.com/authelia/authelia.git && cd authelia
     source bootstrap.sh
 
 If you want to go further, please read [Getting Started](./docs/getting-started.md).
diff --git a/cmd/authelia-scripts/cmd_bootstrap.go b/cmd/authelia-scripts/cmd_bootstrap.go
index 8508d2fbb..1cfc9e6ce 100644
--- a/cmd/authelia-scripts/cmd_bootstrap.go
+++ b/cmd/authelia-scripts/cmd_bootstrap.go
@@ -8,7 +8,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -207,5 +207,5 @@ func Bootstrap(cobraCmd *cobra.Command, args []string) {
 
 	fmt.Println()
 	bootstrapPrintln("Run 'authelia-scripts suites setup Standalone' to start Authelia and visit https://home.example.com:8080.")
-	bootstrapPrintln("More details at https://github.com/clems4ever/authelia/blob/master/docs/getting-started.md")
+	bootstrapPrintln("More details at https://github.com/authelia/authelia/blob/master/docs/getting-started.md")
 }
diff --git a/cmd/authelia-scripts/cmd_build.go b/cmd/authelia-scripts/cmd_build.go
index 9d1088592..5a9a97868 100644
--- a/cmd/authelia-scripts/cmd_build.go
+++ b/cmd/authelia-scripts/cmd_build.go
@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/authelia-scripts/cmd_ci.go b/cmd/authelia-scripts/cmd_ci.go
index c237822a3..2fb0dad4f 100644
--- a/cmd/authelia-scripts/cmd_ci.go
+++ b/cmd/authelia-scripts/cmd_ci.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/authelia-scripts/cmd_docker.go b/cmd/authelia-scripts/cmd_docker.go
index 4656685ed..cc5f9af8e 100644
--- a/cmd/authelia-scripts/cmd_docker.go
+++ b/cmd/authelia-scripts/cmd_docker.go
@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/authelia-scripts/cmd_hash_password.go b/cmd/authelia-scripts/cmd_hash_password.go
index c6bb5b038..e25aaba0b 100644
--- a/cmd/authelia-scripts/cmd_hash_password.go
+++ b/cmd/authelia-scripts/cmd_hash_password.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/clems4ever/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/authentication"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/authelia-scripts/cmd_serve.go b/cmd/authelia-scripts/cmd_serve.go
index 6c4ae8fa4..bb4cf20cf 100644
--- a/cmd/authelia-scripts/cmd_serve.go
+++ b/cmd/authelia-scripts/cmd_serve.go
@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/authelia-scripts/cmd_suites.go b/cmd/authelia-scripts/cmd_suites.go
index f8dfe6825..2db62e48a 100644
--- a/cmd/authelia-scripts/cmd_suites.go
+++ b/cmd/authelia-scripts/cmd_suites.go
@@ -11,8 +11,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/suites"
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/suites"
+	"github.com/authelia/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/authelia-scripts/cmd_unittest.go b/cmd/authelia-scripts/cmd_unittest.go
index 204904237..54f060e96 100644
--- a/cmd/authelia-scripts/cmd_unittest.go
+++ b/cmd/authelia-scripts/cmd_unittest.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"os"
diff --git a/cmd/authelia-scripts/constants.go b/cmd/authelia-scripts/constants.go
index 728e01a7f..48d7875a0 100644
--- a/cmd/authelia-scripts/constants.go
+++ b/cmd/authelia-scripts/constants.go
@@ -4,7 +4,7 @@ package main
 var OutputDir = "dist"
 
 // DockerImageName the official name of authelia docker image
-var DockerImageName = "clems4ever/authelia"
+var DockerImageName = "authelia/authelia"
 
 // IntermediateDockerImageName local name of the docker image
 var IntermediateDockerImageName = "authelia:dist"
diff --git a/cmd/authelia-scripts/docker.go b/cmd/authelia-scripts/docker.go
index ccc4e204c..66129d54b 100644
--- a/cmd/authelia-scripts/docker.go
+++ b/cmd/authelia-scripts/docker.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/utils"
 )
 
 // Docker a docker object
@@ -59,5 +59,5 @@ func (d *Docker) CleanTag(tag string) error {
 
 // PublishReadme push README.md to dockerhub.
 func (d *Docker) PublishReadme() error {
-	return utils.CommandWithStdout("bash", "-c", `token=$(curl -fs --retry 3 -H "Content-Type: application/json" -X "POST" -d '{"username": "'$DOCKER_USERNAME'", "password": "'$DOCKER_PASSWORD'"}' https://hub.docker.com/v2/users/login/ | jq -r .token) && jq -n --arg msg "$(cat README.md | sed -r 's/(\<img\ src\=\")(\.\/)/\1https:\/\/github.com\/clems4ever\/authelia\/raw\/master\//' | sed 's/\.\//https:\/\/github.com\/clems4ever\/authelia\/blob\/master\//g')" '{"registry":"registry-1.docker.io","full_description": $msg }' | curl -fs --retry 3 -o /dev/null -L -X "PATCH" -H "Content-Type: application/json" -H "Authorization: JWT $token" -d @- https://hub.docker.com/v2/repositories/clems4ever/authelia/`).Run()
+	return utils.CommandWithStdout("bash", "-c", `token=$(curl -fs --retry 3 -H "Content-Type: application/json" -X "POST" -d '{"username": "'$DOCKER_USERNAME'", "password": "'$DOCKER_PASSWORD'"}' https://hub.docker.com/v2/users/login/ | jq -r .token) && jq -n --arg msg "$(cat README.md | sed -r 's/(\<img\ src\=\")(\.\/)/\1https:\/\/github.com\/authelia\/authelia\/raw\/master\//' | sed 's/\.\//https:\/\/github.com\/authelia\/authelia\/blob\/master\//g')" '{"registry":"registry-1.docker.io","full_description": $msg }' | curl -fs --retry 3 -o /dev/null -L -X "PATCH" -H "Content-Type: application/json" -H "Authorization: JWT $token" -d @- https://hub.docker.com/v2/repositories/authelia/authelia/`).Run()
 }
diff --git a/cmd/authelia-scripts/main.go b/cmd/authelia-scripts/main.go
index 4544253e9..aa2e8c8a2 100755
--- a/cmd/authelia-scripts/main.go
+++ b/cmd/authelia-scripts/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/authelia-scripts/migration.go b/cmd/authelia-scripts/migration.go
index 4ac63eed2..b1ca22e41 100644
--- a/cmd/authelia-scripts/migration.go
+++ b/cmd/authelia-scripts/migration.go
@@ -4,8 +4,8 @@ import (
 	"encoding/base64"
 	"strings"
 
-	"github.com/clems4ever/authelia/internal/configuration"
-	"github.com/clems4ever/authelia/internal/storage"
+	"github.com/authelia/authelia/internal/configuration"
+	"github.com/authelia/authelia/internal/storage"
 )
 
 // TOTPSecretsV3 one entry of TOTP secrets in v3
diff --git a/cmd/authelia-scripts/migration_local.go b/cmd/authelia-scripts/migration_local.go
index eb7e3c068..dee69c8cd 100644
--- a/cmd/authelia-scripts/migration_local.go
+++ b/cmd/authelia-scripts/migration_local.go
@@ -8,8 +8,8 @@ import (
 	"path"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/models"
-	"github.com/clems4ever/authelia/internal/storage"
+	"github.com/authelia/authelia/internal/models"
+	"github.com/authelia/authelia/internal/storage"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/authelia-scripts/migration_mongo.go b/cmd/authelia-scripts/migration_mongo.go
index 49db36cd8..afac9af36 100644
--- a/cmd/authelia-scripts/migration_mongo.go
+++ b/cmd/authelia-scripts/migration_mongo.go
@@ -5,8 +5,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/models"
-	"github.com/clems4ever/authelia/internal/storage"
+	"github.com/authelia/authelia/internal/models"
+	"github.com/authelia/authelia/internal/storage"
 	"github.com/spf13/cobra"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
diff --git a/cmd/authelia-suites/main.go b/cmd/authelia-suites/main.go
index ddd473e07..2ac03c3a2 100644
--- a/cmd/authelia-suites/main.go
+++ b/cmd/authelia-suites/main.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/clems4ever/authelia/internal/suites"
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/suites"
+	"github.com/authelia/authelia/internal/utils"
 	"github.com/otiai10/copy"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
diff --git a/cmd/authelia/main.go b/cmd/authelia/main.go
index 629e168c7..34e43e9f5 100644
--- a/cmd/authelia/main.go
+++ b/cmd/authelia/main.go
@@ -6,17 +6,17 @@ import (
 	"log"
 	"os"
 
-	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/internal/authorization"
-	"github.com/clems4ever/authelia/internal/configuration"
-	"github.com/clems4ever/authelia/internal/logging"
-	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/internal/notification"
-	"github.com/clems4ever/authelia/internal/regulation"
-	"github.com/clems4ever/authelia/internal/server"
-	"github.com/clems4ever/authelia/internal/session"
-	"github.com/clems4ever/authelia/internal/storage"
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/authorization"
+	"github.com/authelia/authelia/internal/configuration"
+	"github.com/authelia/authelia/internal/logging"
+	"github.com/authelia/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/notification"
+	"github.com/authelia/authelia/internal/regulation"
+	"github.com/authelia/authelia/internal/server"
+	"github.com/authelia/authelia/internal/session"
+	"github.com/authelia/authelia/internal/storage"
+	"github.com/authelia/authelia/internal/utils"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
diff --git a/docs/deployment-dev.md b/docs/deployment-dev.md
index dd68623a5..1262d2072 100644
--- a/docs/deployment-dev.md
+++ b/docs/deployment-dev.md
@@ -27,12 +27,12 @@ either by pulling the Docker image or building distributable version.
 ## Build and deploy the distributable version
 
     $ authelia-scripts build
-    $ PUBLIC_DIR=./dist/public_html ./dist/authelia --config /path/to/your/config.yml
+    $ PUBLIC_DIR=./dist/public_html ./dist/authelia --config /path/to/your/configuration.yml
 
 ## Deploy with Docker
 
-    $ docker pull clems4ever/authelia
-    $ docker run -v /path/to/your/config.yml:/etc/authelia/config.yml clems4ever/authelia
+    $ docker pull authelia/authelia
+    $ docker run -v /path/to/your/configuration.yml:/etc/authelia/configuration.yml authelia/authelia
 
 ## Deploy Nginx
 
@@ -115,7 +115,7 @@ Copy this newly hashed password into your `users_database.yml` file, prefixed wi
 `{CRYPT}` as shown in the example file above.
 
 Once the file is created, edit the configuration file with the following
-block (as used in [config.yml](../test/suites/basic/config.yml)):
+block (as used in [configuration.yml](../test/suites/basic/configuration.yml)):
 
     authentication_backend:
       file:
diff --git a/docs/deployment-production.md b/docs/deployment-production.md
index b0c7b568b..6eb5cfa1b 100644
--- a/docs/deployment-production.md
+++ b/docs/deployment-production.md
@@ -24,7 +24,7 @@ multiple instances to evenly handle the traffic.
 deploy **Authelia** with only nginx. This is described in [Deployment for Devs].
 
 Here are the available steps to deploy **Authelia** given 
-the configuration file is **/path/to/your/config.yml**. Note that you can
+the configuration file is **/path/to/your/configuration.yml**. Note that you can
 create your own configuration file from [config.template.yml] located at
 the root of the repo.
 
@@ -32,11 +32,11 @@ the root of the repo.
 
     # Build it if not done already
     $ authelia-scripts build
-    $ PUBLIC_DIR=./dist/public_html authelia --config /path/to/your/config.yml
+    $ PUBLIC_DIR=./dist/public_html authelia --config /path/to/your/configuration.yml
 
 ### Deploy With Docker
 
-    $ docker run -v /path/to/your/config.yml:/etc/authelia/config.yml -e TZ=Europe/Paris clems4ever/$ $ authelia --config /etc/authelia/config.yml
+    $ docker run -v /path/to/your/configuration.yml:/etc/authelia/configuration.yml -e TZ=Europe/Paris authelia/authelia
 
 
 ## On top of Kubernetes
diff --git a/docs/features.md b/docs/features.md
index 78e091afe..eb91186c3 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -72,6 +72,6 @@ Redis key/value store. You can specify your own Redis instance in
 [config.template.yml].
 
 [basic authentication]: https://en.wikipedia.org/wiki/Basic_access_authentication
-[config.template.yml]: https://github.com/clems4ever/authelia/blob/master/config.template.yml
+[config.template.yml]: https://github.com/authelia/authelia/blob/master/config.template.yml
 [Yubikey]: https://www.yubico.com/products/yubikey-hardware/yubikey4/
 [Google Authenticator]: https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en
\ No newline at end of file
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 54f5fc494..af80a3dde 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -69,5 +69,5 @@ in /etc/hosts when you first source the bootstrap.sh script.
 You can refer to the dedicated documentation [here](./build-and-dev.md).
 
 [config.template.yml]: ../config.template.yml
-[DockerHub]: https://hub.docker.com/r/clems4ever/authelia/
+[DockerHub]: https://hub.docker.com/r/authelia/authelia/
 [suite]: ./suites.md
\ No newline at end of file
diff --git a/example/compose/nginx/backend/html/home/index.html b/example/compose/nginx/backend/html/home/index.html
index 3838ef9f2..28d462d27 100644
--- a/example/compose/nginx/backend/html/home/index.html
+++ b/example/compose/nginx/backend/html/home/index.html
@@ -79,7 +79,7 @@
 
   <h1>Access control rules</h1>
   <p></p>These rules are extracted from the configuration file
-  <a href="https://github.com/clems4ever/authelia/blob/master/config.template.yml">config.template.yml</a>.</p>
+  <a href="https://github.com/authelia/authelia/blob/master/config.template.yml">config.template.yml</a>.</p>
   <pre id="rules" style="border: 1px grey solid; padding: 20px; display: inline-block;">
   default_policy: deny
 
diff --git a/example/kube/test.yml b/example/kube/test.yml
index 6debf895b..5dc93c8bb 100644
--- a/example/kube/test.yml
+++ b/example/kube/test.yml
@@ -18,5 +18,5 @@ spec:
     spec:
       containers:
       - name: test-app1
-        image: clems4ever/authelia:kube
+        image: authelia/authelia:kube
         imagePullPolicy: Never
diff --git a/example/swarm/docker-compose.yml b/example/swarm/docker-compose.yml
index 891593719..5b3ace21e 100644
--- a/example/swarm/docker-compose.yml
+++ b/example/swarm/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.4"
 services:
   authelia:
-    image: clems4ever/authelia:latest
+    image: authelia/authelia:latest
     # Used for Docker configs
     configs:
       - source: authelia
diff --git a/go.mod b/go.mod
index cd35442fd..44db922ca 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/clems4ever/authelia
+module github.com/authelia/authelia
 
 go 1.13
 
diff --git a/internal/authentication/ldap_user_provider.go b/internal/authentication/ldap_user_provider.go
index 237ad2932..edde8c8e0 100644
--- a/internal/authentication/ldap_user_provider.go
+++ b/internal/authentication/ldap_user_provider.go
@@ -6,8 +6,8 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/internal/logging"
+	"github.com/authelia/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/logging"
 	"gopkg.in/ldap.v3"
 )
 
diff --git a/internal/authentication/ldap_user_provider_test.go b/internal/authentication/ldap_user_provider_test.go
index 1e666170b..00b0f7c61 100644
--- a/internal/authentication/ldap_user_provider_test.go
+++ b/internal/authentication/ldap_user_provider_test.go
@@ -3,7 +3,7 @@ package authentication
 import (
 	"testing"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 	gomock "github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 )
diff --git a/internal/authorization/authorizer.go b/internal/authorization/authorizer.go
index 7cdfeb63f..b3db1b4e1 100644
--- a/internal/authorization/authorizer.go
+++ b/internal/authorization/authorizer.go
@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 )
 
 const userPrefix = "user:"
diff --git a/internal/authorization/authorizer_test.go b/internal/authorization/authorizer_test.go
index fec72e087..d7c001d8d 100644
--- a/internal/authorization/authorizer_test.go
+++ b/internal/authorization/authorizer_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/internal/configuration/reader.go b/internal/configuration/reader.go
index 8a3f17eb8..ef495971b 100644
--- a/internal/configuration/reader.go
+++ b/internal/configuration/reader.go
@@ -5,8 +5,8 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/internal/configuration/validator"
+	"github.com/authelia/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/validator"
 )
 
 func check(e error) {
diff --git a/internal/configuration/schema/validator_test.go b/internal/configuration/schema/validator_test.go
index 5490a9ead..421abd2cf 100644
--- a/internal/configuration/schema/validator_test.go
+++ b/internal/configuration/schema/validator_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 )
 
 type TestNestedStruct struct {
diff --git a/internal/configuration/validator/authentication.go b/internal/configuration/validator/authentication.go
index e3f1e5618..f9968e911 100644
--- a/internal/configuration/validator/authentication.go
+++ b/internal/configuration/validator/authentication.go
@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 )
 
 var ldapProtocolPrefix = "ldap://"
diff --git a/internal/configuration/validator/authentication_test.go b/internal/configuration/validator/authentication_test.go
index c0a97e518..f61dbebdc 100644
--- a/internal/configuration/validator/authentication_test.go
+++ b/internal/configuration/validator/authentication_test.go
@@ -3,7 +3,7 @@ package validator
 import (
 	"testing"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
diff --git a/internal/configuration/validator/configuration.go b/internal/configuration/validator/configuration.go
index 0757580fa..b4b45c5aa 100644
--- a/internal/configuration/validator/configuration.go
+++ b/internal/configuration/validator/configuration.go
@@ -3,7 +3,7 @@ package validator
 import (
 	"fmt"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 )
 
 var defaultPort = 8080
diff --git a/internal/configuration/validator/configuration_test.go b/internal/configuration/validator/configuration_test.go
index c560d91b8..22630c720 100644
--- a/internal/configuration/validator/configuration_test.go
+++ b/internal/configuration/validator/configuration_test.go
@@ -3,7 +3,7 @@ package validator
 import (
 	"testing"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/configuration/validator/session.go b/internal/configuration/validator/session.go
index c03c31e09..4e3009990 100644
--- a/internal/configuration/validator/session.go
+++ b/internal/configuration/validator/session.go
@@ -3,7 +3,7 @@ package validator
 import (
 	"errors"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 )
 
 // ValidateSession validates and update session configuration.
diff --git a/internal/configuration/validator/session_test.go b/internal/configuration/validator/session_test.go
index e84e08471..936a7fe02 100644
--- a/internal/configuration/validator/session_test.go
+++ b/internal/configuration/validator/session_test.go
@@ -3,7 +3,7 @@ package validator
 import (
 	"testing"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/configuration/validator/storage.go b/internal/configuration/validator/storage.go
index 133737835..0faa065a1 100644
--- a/internal/configuration/validator/storage.go
+++ b/internal/configuration/validator/storage.go
@@ -3,7 +3,7 @@ package validator
 import (
 	"errors"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 )
 
 // ValidateSQLStorage validates storage configuration.
diff --git a/internal/configuration/validator/totp.go b/internal/configuration/validator/totp.go
index 692ba5a8b..edd7ad756 100644
--- a/internal/configuration/validator/totp.go
+++ b/internal/configuration/validator/totp.go
@@ -1,7 +1,7 @@
 package validator
 
 import (
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 )
 
 const defaultTOTPIssuer = "Authelia"
diff --git a/internal/handlers/handler_configuration.go b/internal/handlers/handler_configuration.go
index 1a96148e2..e4ae3d3f5 100644
--- a/internal/handlers/handler_configuration.go
+++ b/internal/handlers/handler_configuration.go
@@ -1,6 +1,6 @@
 package handlers
 
-import "github.com/clems4ever/authelia/internal/middlewares"
+import "github.com/authelia/authelia/internal/middlewares"
 
 type ConfigurationBody struct {
 	GoogleAnalyticsTrackingID string `json:"ga_tracking_id,omitempty"`
diff --git a/internal/handlers/handler_configuration_test.go b/internal/handlers/handler_configuration_test.go
index e7532802f..a01e42f61 100644
--- a/internal/handlers/handler_configuration_test.go
+++ b/internal/handlers/handler_configuration_test.go
@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"github.com/clems4ever/authelia/internal/mocks"
+	"github.com/authelia/authelia/internal/mocks"
 	"github.com/stretchr/testify/suite"
 )
 
diff --git a/internal/handlers/handler_extended_configuration.go b/internal/handlers/handler_extended_configuration.go
index bd32d6eb9..04e2ee5e6 100644
--- a/internal/handlers/handler_extended_configuration.go
+++ b/internal/handlers/handler_extended_configuration.go
@@ -1,8 +1,8 @@
 package handlers
 
 import (
-	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/middlewares"
 )
 
 type ExtendedConfigurationBody struct {
diff --git a/internal/handlers/handler_extended_configuration_test.go b/internal/handlers/handler_extended_configuration_test.go
index c0cd06c12..6865d832e 100644
--- a/internal/handlers/handler_extended_configuration_test.go
+++ b/internal/handlers/handler_extended_configuration_test.go
@@ -3,9 +3,9 @@ package handlers
 import (
 	"testing"
 
-	"github.com/clems4ever/authelia/internal/mocks"
+	"github.com/authelia/authelia/internal/mocks"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 	"github.com/stretchr/testify/suite"
 )
 
diff --git a/internal/handlers/handler_firstfactor.go b/internal/handlers/handler_firstfactor.go
index d4d066b81..2d42ac7a3 100644
--- a/internal/handlers/handler_firstfactor.go
+++ b/internal/handlers/handler_firstfactor.go
@@ -5,11 +5,11 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/internal/authorization"
-	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/internal/regulation"
-	"github.com/clems4ever/authelia/internal/session"
+	"github.com/authelia/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/authorization"
+	"github.com/authelia/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/regulation"
+	"github.com/authelia/authelia/internal/session"
 )
 
 // FirstFactorPost is the handler performing the first factory.
diff --git a/internal/handlers/handler_firstfactor_test.go b/internal/handlers/handler_firstfactor_test.go
index ad42d47d1..487381998 100644
--- a/internal/handlers/handler_firstfactor_test.go
+++ b/internal/handlers/handler_firstfactor_test.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/clems4ever/authelia/internal/mocks"
-	"github.com/clems4ever/authelia/internal/models"
+	"github.com/authelia/authelia/internal/mocks"
+	"github.com/authelia/authelia/internal/models"
 
-	"github.com/clems4ever/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/authentication"
 	"github.com/golang/mock/gomock"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
diff --git a/internal/handlers/handler_logout.go b/internal/handlers/handler_logout.go
index 36e4d33c9..0f6c46554 100644
--- a/internal/handlers/handler_logout.go
+++ b/internal/handlers/handler_logout.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"fmt"
 
-	"github.com/clems4ever/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/middlewares"
 )
 
 // LogoutPost is the handler logging out the user attached to the given cookie.
diff --git a/internal/handlers/handler_logout_test.go b/internal/handlers/handler_logout_test.go
index e9aa9f8cc..7894b238e 100644
--- a/internal/handlers/handler_logout_test.go
+++ b/internal/handlers/handler_logout_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/clems4ever/authelia/internal/mocks"
+	"github.com/authelia/authelia/internal/mocks"
 
 	"github.com/stretchr/testify/assert"
 
diff --git a/internal/handlers/handler_register_totp.go b/internal/handlers/handler_register_totp.go
index 5f046b6fe..63ea2dc35 100644
--- a/internal/handlers/handler_register_totp.go
+++ b/internal/handlers/handler_register_totp.go
@@ -3,8 +3,8 @@ package handlers
 import (
 	"fmt"
 
-	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/internal/session"
+	"github.com/authelia/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/session"
 	"github.com/pquerna/otp/totp"
 )
 
diff --git a/internal/handlers/handler_register_u2f_step1.go b/internal/handlers/handler_register_u2f_step1.go
index dad231e0b..47c44fc63 100644
--- a/internal/handlers/handler_register_u2f_step1.go
+++ b/internal/handlers/handler_register_u2f_step1.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"fmt"
 
-	"github.com/clems4ever/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/middlewares"
 	"github.com/tstranex/u2f"
 )
 
diff --git a/internal/handlers/handler_register_u2f_step2.go b/internal/handlers/handler_register_u2f_step2.go
index 12b5fc500..b645cc38b 100644
--- a/internal/handlers/handler_register_u2f_step2.go
+++ b/internal/handlers/handler_register_u2f_step2.go
@@ -4,7 +4,7 @@ import (
 	"crypto/elliptic"
 	"fmt"
 
-	"github.com/clems4ever/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/middlewares"
 	"github.com/tstranex/u2f"
 )
 
diff --git a/internal/handlers/handler_reset_password_step1.go b/internal/handlers/handler_reset_password_step1.go
index eb85640c2..afab6adc4 100644
--- a/internal/handlers/handler_reset_password_step1.go
+++ b/internal/handlers/handler_reset_password_step1.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/internal/session"
+	"github.com/authelia/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/session"
 )
 
 func identityRetrieverFromStorage(ctx *middlewares.AutheliaCtx) (*session.Identity, error) {
diff --git a/internal/handlers/handler_reset_password_step2.go b/internal/handlers/handler_reset_password_step2.go
index c43c99694..66967662a 100644
--- a/internal/handlers/handler_reset_password_step2.go
+++ b/internal/handlers/handler_reset_password_step2.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"fmt"
 
-	"github.com/clems4ever/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/middlewares"
 )
 
 // ResetPasswordPost handler for resetting passwords
diff --git a/internal/handlers/handler_sign_duo.go b/internal/handlers/handler_sign_duo.go
index eee49df4f..41d164de4 100644
--- a/internal/handlers/handler_sign_duo.go
+++ b/internal/handlers/handler_sign_duo.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/internal/duo"
-	"github.com/clems4ever/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/duo"
+	"github.com/authelia/authelia/internal/middlewares"
 )
 
 // SecondFactorDuoPost handler for sending a push notification via duo api.
diff --git a/internal/handlers/handler_sign_duo_test.go b/internal/handlers/handler_sign_duo_test.go
index 8877e98df..40aba516f 100644
--- a/internal/handlers/handler_sign_duo_test.go
+++ b/internal/handlers/handler_sign_duo_test.go
@@ -5,8 +5,8 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/clems4ever/authelia/internal/duo"
-	"github.com/clems4ever/authelia/internal/mocks"
+	"github.com/authelia/authelia/internal/duo"
+	"github.com/authelia/authelia/internal/mocks"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
diff --git a/internal/handlers/handler_sign_totp.go b/internal/handlers/handler_sign_totp.go
index aeccee3d8..77cc90a58 100644
--- a/internal/handlers/handler_sign_totp.go
+++ b/internal/handlers/handler_sign_totp.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/middlewares"
 	"github.com/pquerna/otp/totp"
 )
 
diff --git a/internal/handlers/handler_sign_u2f_step1.go b/internal/handlers/handler_sign_u2f_step1.go
index 412080400..c5532f666 100644
--- a/internal/handlers/handler_sign_u2f_step1.go
+++ b/internal/handlers/handler_sign_u2f_step1.go
@@ -4,9 +4,9 @@ import (
 	"crypto/elliptic"
 	"fmt"
 
-	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/internal/session"
-	"github.com/clems4ever/authelia/internal/storage"
+	"github.com/authelia/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/session"
+	"github.com/authelia/authelia/internal/storage"
 	"github.com/tstranex/u2f"
 )
 
diff --git a/internal/handlers/handler_sign_u2f_step2.go b/internal/handlers/handler_sign_u2f_step2.go
index d189ad8e3..a1e4857d0 100644
--- a/internal/handlers/handler_sign_u2f_step2.go
+++ b/internal/handlers/handler_sign_u2f_step2.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/middlewares"
 	"github.com/tstranex/u2f"
 )
 
diff --git a/internal/handlers/handler_state.go b/internal/handlers/handler_state.go
index b013c5606..87d86f76e 100644
--- a/internal/handlers/handler_state.go
+++ b/internal/handlers/handler_state.go
@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"github.com/clems4ever/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/middlewares"
 )
 
 // StateGet is the handler serving the user state.
diff --git a/internal/handlers/handler_state_test.go b/internal/handlers/handler_state_test.go
index 12eff91f9..e69ccebc9 100644
--- a/internal/handlers/handler_state_test.go
+++ b/internal/handlers/handler_state_test.go
@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/clems4ever/authelia/internal/mocks"
+	"github.com/authelia/authelia/internal/mocks"
 
-	"github.com/clems4ever/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/authentication"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )
diff --git a/internal/handlers/handler_user_info.go b/internal/handlers/handler_user_info.go
index 9f51774be..1f67f24f1 100644
--- a/internal/handlers/handler_user_info.go
+++ b/internal/handlers/handler_user_info.go
@@ -5,10 +5,10 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/internal/storage"
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/storage"
+	"github.com/authelia/authelia/internal/utils"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/internal/handlers/handler_user_info_test.go b/internal/handlers/handler_user_info_test.go
index f7a1970bc..19e472ee8 100644
--- a/internal/handlers/handler_user_info_test.go
+++ b/internal/handlers/handler_user_info_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/clems4ever/authelia/internal/mocks"
-	"github.com/clems4ever/authelia/internal/storage"
+	"github.com/authelia/authelia/internal/mocks"
+	"github.com/authelia/authelia/internal/storage"
 
 	"github.com/golang/mock/gomock"
 	"github.com/sirupsen/logrus"
diff --git a/internal/handlers/handler_verify.go b/internal/handlers/handler_verify.go
index 5a4eba80f..ba865049f 100644
--- a/internal/handlers/handler_verify.go
+++ b/internal/handlers/handler_verify.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/internal/authorization"
-	"github.com/clems4ever/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/authorization"
+	"github.com/authelia/authelia/internal/middlewares"
 	"github.com/valyala/fasthttp"
 )
 
diff --git a/internal/handlers/handler_verify_test.go b/internal/handlers/handler_verify_test.go
index 2a7775a6d..eaa394833 100644
--- a/internal/handlers/handler_verify_test.go
+++ b/internal/handlers/handler_verify_test.go
@@ -6,10 +6,10 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/internal/authorization"
-	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/internal/mocks"
+	"github.com/authelia/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/authorization"
+	"github.com/authelia/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/mocks"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
diff --git a/internal/handlers/types.go b/internal/handlers/types.go
index 9fb767d3e..becb6d02e 100644
--- a/internal/handlers/types.go
+++ b/internal/handlers/types.go
@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"github.com/clems4ever/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/authentication"
 	"github.com/tstranex/u2f"
 )
 
diff --git a/internal/middlewares/authelia_context.go b/internal/middlewares/authelia_context.go
index cfed540b1..6d3d7aba0 100644
--- a/internal/middlewares/authelia_context.go
+++ b/internal/middlewares/authelia_context.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/asaskevich/govalidator"
-	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/internal/session"
+	"github.com/authelia/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/session"
 	"github.com/sirupsen/logrus"
 	"github.com/valyala/fasthttp"
 )
diff --git a/internal/middlewares/authelia_context_test.go b/internal/middlewares/authelia_context_test.go
index 35fe46fca..919ab2567 100644
--- a/internal/middlewares/authelia_context_test.go
+++ b/internal/middlewares/authelia_context_test.go
@@ -3,11 +3,11 @@ package middlewares_test
 import (
 	"testing"
 
-	"github.com/clems4ever/authelia/internal/session"
+	"github.com/authelia/authelia/internal/session"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/internal/mocks"
+	"github.com/authelia/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/mocks"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/valyala/fasthttp"
diff --git a/internal/middlewares/identity_verification.go b/internal/middlewares/identity_verification.go
index 2e8c47bc3..cb664ebac 100644
--- a/internal/middlewares/identity_verification.go
+++ b/internal/middlewares/identity_verification.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/templates"
+	"github.com/authelia/authelia/internal/templates"
 	jwt "github.com/dgrijalva/jwt-go"
 )
 
diff --git a/internal/middlewares/identity_verification_test.go b/internal/middlewares/identity_verification_test.go
index 7822ff3b8..e963380f6 100644
--- a/internal/middlewares/identity_verification_test.go
+++ b/internal/middlewares/identity_verification_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/internal/mocks"
-	"github.com/clems4ever/authelia/internal/session"
+	"github.com/authelia/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/mocks"
+	"github.com/authelia/authelia/internal/session"
 	jwt "github.com/dgrijalva/jwt-go"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
diff --git a/internal/middlewares/require_first_factor.go b/internal/middlewares/require_first_factor.go
index dd8047925..05d412d6b 100644
--- a/internal/middlewares/require_first_factor.go
+++ b/internal/middlewares/require_first_factor.go
@@ -1,7 +1,7 @@
 package middlewares
 
 import (
-	"github.com/clems4ever/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/authentication"
 )
 
 // RequireFirstFactor check if user has enough permissions to execute the next handler.
diff --git a/internal/middlewares/types.go b/internal/middlewares/types.go
index 9f01f672d..6d98319d2 100644
--- a/internal/middlewares/types.go
+++ b/internal/middlewares/types.go
@@ -1,13 +1,13 @@
 package middlewares
 
 import (
-	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/internal/authorization"
-	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/internal/notification"
-	"github.com/clems4ever/authelia/internal/regulation"
-	"github.com/clems4ever/authelia/internal/session"
-	"github.com/clems4ever/authelia/internal/storage"
+	"github.com/authelia/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/authorization"
+	"github.com/authelia/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/notification"
+	"github.com/authelia/authelia/internal/regulation"
+	"github.com/authelia/authelia/internal/session"
+	"github.com/authelia/authelia/internal/storage"
 	jwt "github.com/dgrijalva/jwt-go"
 	"github.com/sirupsen/logrus"
 	"github.com/valyala/fasthttp"
diff --git a/internal/mocks/mock_authelia_ctx.go b/internal/mocks/mock_authelia_ctx.go
index 3c0f19dfd..cdc6bc6ff 100644
--- a/internal/mocks/mock_authelia_ctx.go
+++ b/internal/mocks/mock_authelia_ctx.go
@@ -6,15 +6,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/regulation"
-	"github.com/clems4ever/authelia/internal/storage"
+	"github.com/authelia/authelia/internal/regulation"
+	"github.com/authelia/authelia/internal/storage"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/clems4ever/authelia/internal/authorization"
-	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/internal/session"
+	"github.com/authelia/authelia/internal/authorization"
+	"github.com/authelia/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/session"
 	"github.com/golang/mock/gomock"
 	"github.com/sirupsen/logrus"
 	"github.com/sirupsen/logrus/hooks/test"
diff --git a/internal/mocks/mock_duo_api.go b/internal/mocks/mock_duo_api.go
index de4b7ff25..3bc692bd2 100644
--- a/internal/mocks/mock_duo_api.go
+++ b/internal/mocks/mock_duo_api.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/clems4ever/authelia/internal/duo (interfaces: API)
+// Source: github.com/authelia/authelia/internal/duo (interfaces: API)
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -8,7 +8,7 @@ import (
 	url "net/url"
 	reflect "reflect"
 
-	duo "github.com/clems4ever/authelia/internal/duo"
+	duo "github.com/authelia/authelia/internal/duo"
 	gomock "github.com/golang/mock/gomock"
 )
 
diff --git a/internal/mocks/mock_notifier.go b/internal/mocks/mock_notifier.go
index f05503bbb..55a076d2c 100644
--- a/internal/mocks/mock_notifier.go
+++ b/internal/mocks/mock_notifier.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/clems4ever/authelia/internal/notification (interfaces: Notifier)
+// Source: github.com/authelia/authelia/internal/notification (interfaces: Notifier)
 
 // Package mock_notification is a generated GoMock package.
 package mocks
diff --git a/internal/mocks/mock_user_provider.go b/internal/mocks/mock_user_provider.go
index 7e594eb11..73d589d56 100644
--- a/internal/mocks/mock_user_provider.go
+++ b/internal/mocks/mock_user_provider.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/clems4ever/authelia/internal/authentication (interfaces: UserProvider)
+// Source: github.com/authelia/authelia/internal/authentication (interfaces: UserProvider)
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -7,7 +7,7 @@ package mocks
 import (
 	reflect "reflect"
 
-	authentication "github.com/clems4ever/authelia/internal/authentication"
+	authentication "github.com/authelia/authelia/internal/authentication"
 	gomock "github.com/golang/mock/gomock"
 )
 
diff --git a/internal/notification/file_notifier.go b/internal/notification/file_notifier.go
index 81fb3df4a..90d360dcb 100644
--- a/internal/notification/file_notifier.go
+++ b/internal/notification/file_notifier.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 )
 
 // FileNotifier a notifier to send emails to SMTP servers.
diff --git a/internal/notification/smtp_notifier.go b/internal/notification/smtp_notifier.go
index 24df7ee35..861e195ae 100644
--- a/internal/notification/smtp_notifier.go
+++ b/internal/notification/smtp_notifier.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/smtp"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 )
 
 // SMTPNotifier a notifier to send emails to SMTP servers.
diff --git a/internal/regulation/regulator.go b/internal/regulation/regulator.go
index 1997008cd..2478ab688 100644
--- a/internal/regulation/regulator.go
+++ b/internal/regulation/regulator.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/internal/models"
-	"github.com/clems4ever/authelia/internal/storage"
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/models"
+	"github.com/authelia/authelia/internal/storage"
+	"github.com/authelia/authelia/internal/utils"
 )
 
 // NewRegulator create a regulator instance.
diff --git a/internal/regulation/regulator_test.go b/internal/regulation/regulator_test.go
index 00b8a3ed2..53f0e6c4a 100644
--- a/internal/regulation/regulator_test.go
+++ b/internal/regulation/regulator_test.go
@@ -4,11 +4,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/internal/mocks"
-	"github.com/clems4ever/authelia/internal/models"
-	"github.com/clems4ever/authelia/internal/regulation"
-	"github.com/clems4ever/authelia/internal/storage"
+	"github.com/authelia/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/mocks"
+	"github.com/authelia/authelia/internal/models"
+	"github.com/authelia/authelia/internal/regulation"
+	"github.com/authelia/authelia/internal/storage"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
diff --git a/internal/regulation/types.go b/internal/regulation/types.go
index 02add27e8..9b0270b38 100644
--- a/internal/regulation/types.go
+++ b/internal/regulation/types.go
@@ -3,8 +3,8 @@ package regulation
 import (
 	"time"
 
-	"github.com/clems4ever/authelia/internal/storage"
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/storage"
+	"github.com/authelia/authelia/internal/utils"
 )
 
 // Regulator an authentication regulator preventing attackers to brute force the service.
diff --git a/internal/server/server.go b/internal/server/server.go
index a46ceac00..40ce1b8de 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -5,11 +5,11 @@ import (
 	"os"
 	"path"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/internal/duo"
-	"github.com/clems4ever/authelia/internal/handlers"
-	"github.com/clems4ever/authelia/internal/logging"
-	"github.com/clems4ever/authelia/internal/middlewares"
+	"github.com/authelia/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/duo"
+	"github.com/authelia/authelia/internal/handlers"
+	"github.com/authelia/authelia/internal/logging"
+	"github.com/authelia/authelia/internal/middlewares"
 	duoapi "github.com/duosecurity/duo_api_golang"
 	"github.com/fasthttp/router"
 	"github.com/valyala/fasthttp"
diff --git a/internal/session/provider.go b/internal/session/provider.go
index 8d8616b24..f61b12ad4 100644
--- a/internal/session/provider.go
+++ b/internal/session/provider.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 	fasthttpsession "github.com/fasthttp/session"
 	"github.com/valyala/fasthttp"
 )
diff --git a/internal/session/provider_config.go b/internal/session/provider_config.go
index 7b3557299..fea588df9 100644
--- a/internal/session/provider_config.go
+++ b/internal/session/provider_config.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/valyala/fasthttp"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 	"github.com/fasthttp/session"
 	"github.com/fasthttp/session/memory"
 	"github.com/fasthttp/session/redis"
diff --git a/internal/session/provider_config_test.go b/internal/session/provider_config_test.go
index 4e562832e..15718c886 100644
--- a/internal/session/provider_config_test.go
+++ b/internal/session/provider_config_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 	"github.com/fasthttp/session/memory"
 	"github.com/fasthttp/session/redis"
 	"github.com/stretchr/testify/assert"
diff --git a/internal/session/provider_test.go b/internal/session/provider_test.go
index f43e433ca..183d7dd2f 100644
--- a/internal/session/provider_test.go
+++ b/internal/session/provider_test.go
@@ -3,13 +3,13 @@ package session
 import (
 	"testing"
 
-	"github.com/clems4ever/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/authentication"
 
 	"github.com/stretchr/testify/assert"
 
 	"github.com/valyala/fasthttp"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/configuration/schema"
 )
 
 func TestShouldInitializerSession(t *testing.T) {
diff --git a/internal/session/types.go b/internal/session/types.go
index 1e15b1163..3417808eb 100644
--- a/internal/session/types.go
+++ b/internal/session/types.go
@@ -1,7 +1,7 @@
 package session
 
 import (
-	"github.com/clems4ever/authelia/internal/authentication"
+	"github.com/authelia/authelia/internal/authentication"
 	"github.com/fasthttp/session"
 	"github.com/tstranex/u2f"
 )
diff --git a/internal/session/user_session.go b/internal/session/user_session.go
index 1d0dce8b4..bf2b245c2 100644
--- a/internal/session/user_session.go
+++ b/internal/session/user_session.go
@@ -1,6 +1,6 @@
 package session
 
-import "github.com/clems4ever/authelia/internal/authentication"
+import "github.com/authelia/authelia/internal/authentication"
 
 // NewDefaultUserSession create a default user session.
 func NewDefaultUserSession() UserSession {
diff --git a/internal/storage/mysql_provider.go b/internal/storage/mysql_provider.go
index 8ea2800af..2f2547f8d 100644
--- a/internal/storage/mysql_provider.go
+++ b/internal/storage/mysql_provider.go
@@ -4,8 +4,8 @@ import (
 	"database/sql"
 	"fmt"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/internal/logging"
+	"github.com/authelia/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/logging"
 	_ "github.com/go-sql-driver/mysql" // Load the MySQL Driver used in the connection string.
 )
 
diff --git a/internal/storage/postgres_provider.go b/internal/storage/postgres_provider.go
index 3882250de..324b77a14 100644
--- a/internal/storage/postgres_provider.go
+++ b/internal/storage/postgres_provider.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/internal/logging"
+	"github.com/authelia/authelia/internal/configuration/schema"
+	"github.com/authelia/authelia/internal/logging"
 	_ "github.com/lib/pq" // Load the PostgreSQL Driver used in the connection string.
 )
 
diff --git a/internal/storage/provider.go b/internal/storage/provider.go
index 4942b0b8b..239a5337c 100644
--- a/internal/storage/provider.go
+++ b/internal/storage/provider.go
@@ -3,7 +3,7 @@ package storage
 import (
 	"time"
 
-	"github.com/clems4ever/authelia/internal/models"
+	"github.com/authelia/authelia/internal/models"
 )
 
 // Provider is an interface providing storage capabilities for
diff --git a/internal/storage/provider_mock.go b/internal/storage/provider_mock.go
index 670c85d07..c13adb018 100644
--- a/internal/storage/provider_mock.go
+++ b/internal/storage/provider_mock.go
@@ -5,7 +5,7 @@
 package storage
 
 import (
-	models "github.com/clems4ever/authelia/internal/models"
+	models "github.com/authelia/authelia/internal/models"
 	gomock "github.com/golang/mock/gomock"
 	reflect "reflect"
 	time "time"
diff --git a/internal/storage/sql_provider.go b/internal/storage/sql_provider.go
index e86ab2405..e1fe30cc3 100644
--- a/internal/storage/sql_provider.go
+++ b/internal/storage/sql_provider.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/models"
+	"github.com/authelia/authelia/internal/models"
 )
 
 // SQLProvider is a storage provider persisting data in a SQL database.
diff --git a/internal/storage/sqlite_provider.go b/internal/storage/sqlite_provider.go
index 33fa8fdbc..133eec12e 100644
--- a/internal/storage/sqlite_provider.go
+++ b/internal/storage/sqlite_provider.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 
-	"github.com/clems4ever/authelia/internal/logging"
+	"github.com/authelia/authelia/internal/logging"
 	_ "github.com/mattn/go-sqlite3" // Load the SQLite Driver used in the connection string.
 )
 
diff --git a/internal/suites/docker.go b/internal/suites/docker.go
index bfa548498..448026cbc 100644
--- a/internal/suites/docker.go
+++ b/internal/suites/docker.go
@@ -5,7 +5,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/internal/suites/environment.go b/internal/suites/environment.go
index cc2a69d9c..e82bf862f 100644
--- a/internal/suites/environment.go
+++ b/internal/suites/environment.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/internal/suites/kubernetes.go b/internal/suites/kubernetes.go
index c4d27e79f..9b351604f 100644
--- a/internal/suites/kubernetes.go
+++ b/internal/suites/kubernetes.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/utils"
 )
 
 var kindImageName = "authelia-kind-proxy"
diff --git a/internal/suites/suite_kubernetes.go b/internal/suites/suite_kubernetes.go
index 2d7514653..3c9636769 100644
--- a/internal/suites/suite_kubernetes.go
+++ b/internal/suites/suite_kubernetes.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/utils"
+	"github.com/authelia/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/internal/suites/suite_standalone_test.go b/internal/suites/suite_standalone_test.go
index afe08122c..b022b2cdd 100644
--- a/internal/suites/suite_standalone_test.go
+++ b/internal/suites/suite_standalone_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/clems4ever/authelia/internal/storage"
+	"github.com/authelia/authelia/internal/storage"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
diff --git a/web/src/layouts/LoginLayout.tsx b/web/src/layouts/LoginLayout.tsx
index 78c20eecd..ab45c4cbb 100644
--- a/web/src/layouts/LoginLayout.tsx
+++ b/web/src/layouts/LoginLayout.tsx
@@ -36,7 +36,7 @@ export default function (props: Props) {
                     </Grid>
                     {props.showBrand ? <Grid item xs={12}>
                         <Link
-                            href="https://github.com/clems4ever/authelia"
+                            href="https://github.com/authelia/authelia"
                             target="_blank"
                             className={style.poweredBy}>
                             Powered by Authelia