diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2b7e1bab..b238a4ba 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,13 +2,13 @@
 
 If you want to contribute or want to build the code from source, you will need to have the most recent version of Go and, if you want to change the static assets (JS, CSS, ...), Node.js installed on your computer. To start developing, you just need to do the following:
 
-1. `go get github.com/hacdias/filemanager/cmd/filemanager`
-2. `cd $GOPATH/src/github.com/hacdias/filemanager`
+1. `go get github.com/filebrowser/filebrowser/cmd/filebrowser`
+2. `cd $GOPATH/src/github.com/filebrowser/filebrowser`
 3. `npm install`
 4. `npm run dev` - regenerates the static assets automatically
-5. `go install github.com/hacdias/filemanager/cmd/filemanager`
-6. Execute `$GOPATH/bin/filemanager`
+5. `go install github.com/filebrowser/filebrowser/cmd/filebrowser`
+6. Execute `$GOPATH/bin/filebrowser`
 
 The steps 3 and 4 are only required **if you want to develop the front-end**. Otherwise, you can ignore them. Before pulling, if you made any change on assets folder, you must run the `build.sh` script on the root of this repository.
 
-If you are using this as a Caddy plugin, you should use its [official instructions for plugins](https://github.com/mholt/caddy/wiki/Extending-Caddy#2-plug-in-your-plugin) and import `github.com/hacdias/filemanager/caddy/filemanager`.
+If you are using this as a Caddy plugin, you should use its [official instructions for plugins](https://github.com/mholt/caddy/wiki/Extending-Caddy#2-plug-in-your-plugin) and import `github.com/filebrowser/caddy/filemanager`.
diff --git a/assets/index.html b/assets/index.html
index 8abc3097..d2746211 100644
--- a/assets/index.html
+++ b/assets/index.html
@@ -4,15 +4,19 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+
+  <!-- Inject some variables -->
   <meta name="base" content="{{ .BaseURL }}">
   <meta name="staticgen" content="{{ .StaticGen }}">
   <meta name="noauth" content="{{ .NoAuth }}">
   <meta name="version" content="{{ .Version }}">
   <meta name="recaptcha" content="{{ .ReCaptchaKey }}">
+
   <title>File Browser</title>
   <link rel="icon" type="image/png" sizes="32x32" href="{{ .BaseURL }}/static/img/icons/favicon-32x32.png">
   <link rel="icon" type="image/png" sizes="16x16" href="{{ .BaseURL }}/static/img/icons/favicon-16x16.png">
   <!--[if IE]><link rel="shortcut icon" href="{{ .BaseURL }}/static/img/icons/favicon.ico"><![endif]-->
+
   <!-- Add to home screen for Android and modern mobile browsers -->
   <link rel="manifest" href="{{ .BaseURL }}/static/manifest.json">
   <meta name="theme-color" content="#2979ff">
@@ -22,6 +26,7 @@
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
   <meta name="apple-mobile-web-app-title" content="assets">
   <link rel="apple-touch-icon" href="{{ .BaseURL }}/static/img/icons/apple-touch-icon-152x152.png">
+
   <!-- Add to home screen for Windows -->
   <meta name="msapplication-TileImage" content="{{ .BaseURL }}/static/img/icons/msapplication-icon-144x144.png">
   <meta name="msapplication-TileColor" content="#2979ff">
diff --git a/assets/src/components/Sidebar.vue b/assets/src/components/Sidebar.vue
index 6c18d1c3..0d754952 100644
--- a/assets/src/components/Sidebar.vue
+++ b/assets/src/components/Sidebar.vue
@@ -59,7 +59,7 @@
     </div>
 
     <p class="credits">
-      <span><a rel="noopener noreferrer" href="https://github.com/hacdias/filemanager">File Browser</a> v{{ version }}</span>
+      <span><a rel="noopener noreferrer" href="https://github.com/filebrowser/filebrowser">File Browser</a> v{{ version }}</span>
       <span><a @click="help">{{ $t('sidebar.help') }}</a></span>
     </p>
   </nav>
diff --git a/assets/src/main.js b/assets/src/main.js
index b071129c..b0053253 100644
--- a/assets/src/main.js
+++ b/assets/src/main.js
@@ -32,7 +32,7 @@ Vue.prototype.$showError = function (error) {
     timeout: null,
     buttons: [
       Noty.button(i18n.t('buttons.reportIssue'), '', function () {
-        window.open('https://github.com/hacdias/filemanager/issues/new')
+        window.open('https://github.com/filebrowser/filebrowser/issues/new')
       }),
       Noty.button(i18n.t('buttons.close'), '', function () {
         n.close()