diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bca4baf6..096004a1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -96,12 +96,12 @@ licensable under the [Apache 2 or GPL 2 licenses][licensing].  Code that cannot
 be released under either of these licenses **cannot be accepted** into the
 project.
 
-[community]: https://github.com/ivaynberg/select2#community
+[community]: https://select2.github.io/community.html
 [reporting-bugs]: #reporting-bugs-with-select2
 [requesting-features]: #requesting-features-in-select2
-[issue-tracker]: https://github.com/ivaynberg/select2/issues
-[mailing-list]: https://github.com/ivaynberg/select2#mailing-list
-[irc-channel]: https://github.com/ivaynberg/select2#irc-channel
-[issue-search]: https://github.com/ivaynberg/select2/search?q=&type=Issues
+[issue-tracker]: https://github.com/select2/select2/issues
+[mailing-list]: https://github.com/select2/select2#mailing-list
+[irc-channel]: https://github.com/select2/select2#irc-channel
+[issue-search]: https://github.com/select2/select2/search?q=&type=Issues
 [isolated-case]: http://css-tricks.com/6263-reduced-test-cases/
-[licensing]: https://github.com/ivaynberg/select2#copyright-and-license
+[licensing]: https://github.com/select2/select2/blob/master/LICENSE.md
diff --git a/README.md b/README.md
index e94610af..321c4757 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Select2 is a jQuery-based replacement for select boxes. It supports searching,
 remote data sets, and pagination of results.
 
 To get started, checkout examples and documentation at
-http://ivaynberg.github.io/select2
+http://select2.github.io/select2
 
 Use cases
 ---------
@@ -74,7 +74,7 @@ Community
 
 Have a bug? Please create an issue here on GitHub!
 
-https://github.com/ivaynberg/select2/issues
+https://github.com/select2/select2/issues
 
 ### Mailing list
 
@@ -105,8 +105,8 @@ The license is available within the repository in the [LICENSE][license] file.
 [bootstrap3-select2]: https://github.com/t0m/select2-bootstrap-css/tree/bootstrap3
 [cdnjs]: http://www.cdnjs.com/libraries/select2
 [django-select2]: https://github.com/applegrew/django-select2
-[documentation]: https://ivaynberg.github.io/select2/
-[documentation-folder]: https://github.com/ivaynberg/select2/tree/master/docs
+[documentation]: https://select2.github.io/select2/
+[documentation-folder]: https://github.com/select2/select2/tree/master/docs
 [freenode]: https://freenode.net/
 [jsdelivr]: http://www.jsdelivr.com/#!select2
 [license]: LICENSE.md
@@ -116,7 +116,7 @@ The license is available within the repository in the [LICENSE][license] file.
 [select2-rails]: https://github.com/argerim/select2-rails
 [symfony-select2]: https://github.com/19Gerhard85/sfSelect2WidgetsPlugin
 [symfony2-select2]: https://github.com/avocode/FormExtensions
-[tags]: https://github.com/ivaynberg/select2/tags
+[tags]: https://github.com/select2/select2/tags
 [wicket]: http://wicket.apache.org
 [wicket-select2]: https://github.com/ivaynberg/wicket-select2
 [yii-select2]: https://github.com/tonybolzan/yii-select2
diff --git a/component.json b/component.json
index 8bd3c020..c11b18b5 100644
--- a/component.json
+++ b/component.json
@@ -1,9 +1,9 @@
 {
   "name": "select2",
-  "repo": "ivaynberg/select2",
+  "repo": "select/select2",
   "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.",
   "version": "3.5.2",
-  "demo": "http://ivaynberg.github.io/select2/",
+  "demo": "https://select2.github.io/",
   "keywords": [
     "jquery"
   ],
diff --git a/composer.json b/composer.json
index cd2d26a2..70b85749 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,9 @@
 {
-  "name":
-  "ivaynberg/select2",
+  "name": "select2/select2",
   "description": "Select2 is a jQuery based replacement for select boxes.",
   "version": "3.5.2",
   "type": "component",
-  "homepage": "http://ivaynberg.github.io/select2/",
+  "homepage": "https://select2.github.io/",
   "license": "Apache-2.0",
   "require": {
     "robloach/component-installer": "*",
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 9662465e..2878ef60 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -1,6 +1,6 @@
 <footer>
   Select2 is licensed under the
-  <a href="https://github.com/ivaynberg/select2/blob/master/LICENSE.md">
+  <a href="https://github.com/select2/select2/blob/master/LICENSE.md">
     MIT license.
   </a>
   The documentation is licensed under
diff --git a/docs/_includes/navigation.html b/docs/_includes/navigation.html
index 12945cc8..d17d4688 100644
--- a/docs/_includes/navigation.html
+++ b/docs/_includes/navigation.html
@@ -39,7 +39,7 @@
 
       <ul class="nav navbar-nav navbar-right">
         <li>
-          <a href="https://github.com/ivaynberg/select2">
+          <a href="https://github.com/select2/select2">
             <i class="fa fa-github"></i>
             GitHub
           </a>
diff --git a/docs/_layouts/home.html b/docs/_layouts/home.html
index 6883c216..6ad26eb7 100644
--- a/docs/_layouts/home.html
+++ b/docs/_layouts/home.html
@@ -4,8 +4,10 @@
         {% include head.html %}
 
         <style type="text/css">
-          .navbar { margin-bottom: 0; }
+          .navbar, .jumbotron { margin-bottom: 0; }
           .jumbotron-side { padding-top: 2em; }
+          .notice-previous { background-color: #d9edf7; border-top: 1px solid #bce8f1; border-bottom: 1px solid #bce8f1; color: #31708f; padding: 0.5em; margin-bottom: 1em; text-align: center; }
+          .notice-previous a { font-weight: bold; }
         </style>
     </head>
     <body>
diff --git a/docs/announcements-4.0.html b/docs/announcements-4.0.html
index e7a99ac2..32d7b5d0 100644
--- a/docs/announcements-4.0.html
+++ b/docs/announcements-4.0.html
@@ -15,7 +15,7 @@ slug: announcements-4.0
       You can use the development version, available on GitHub, by getting the
       source code available in the <code>select2-ng</code> branch. The source
       code can be
-      <a href="https://github.com/ivaynberg/select2/archive/select2-ng.zip">
+      <a href="https://github.com/select2/select2/archive/select2-ng.zip">
         downloaded as a <code>zip</code> archive
       </a> as well.
     </p>
diff --git a/docs/community.html b/docs/community.html
index 2b560e9a..0ae299ac 100644
--- a/docs/community.html
+++ b/docs/community.html
@@ -69,7 +69,7 @@ slug: community
     <ol>
       <li>
         Use the
-        <a href="https://github.com/ivaynberg/select2/search?q=&type=Issues">
+        <a href="https://github.com/select2/select2/search?q=&type=Issues">
           GitHub issue search
         </a>
         to check if your issue has already been reported.
@@ -81,7 +81,7 @@ slug: community
       <li>
         Once you are sure the issue is with Select2, and not a third party
         library,
-        <a href="https://github.com/ivaynberg/select2/issues/new">
+        <a href="https://github.com/select2/select2/issues/new">
           submit a ticket
         </a>
         to the repository.
@@ -90,7 +90,7 @@ slug: community
 
     <p>
       You can find more information on reporting bugs in the
-      <a href="https://github.com/ivaynberg/select2/blob/master/CONTRIBUTING.md#reporting-bugs-with-select2">
+      <a href="https://github.com/select2/select2/blob/master/CONTRIBUTING.md#reporting-bugs-with-select2">
         contributing guide,
       </a>
       including tips on what information to include.
@@ -104,7 +104,7 @@ slug: community
 
     <p>
       New feature requests are usually requested by the
-      <a href="https://github.com/ivaynberg/select2/issues">
+      <a href="https://github.com/select2/select2/issues">
         Select2 community on GitHub,
       </a>
       and are often fulfilled by
@@ -116,7 +116,7 @@ slug: community
     <ol>
       <li>
         Use the
-        <a href="https://github.com/ivaynberg/select2/search?q=&type=Issues">
+        <a href="https://github.com/select2/select2/search?q=&type=Issues">
           GitHub issue search
         </a>
         to check if your feature has already been requested.
@@ -135,7 +135,7 @@ slug: community
 
     <p>
       You can find more information on requesting new features in the
-      <a href="https://github.com/ivaynberg/select2/blob/master/CONTRIBUTING.md#requesting-features-in-select2">
+      <a href="https://github.com/select2/select2/blob/master/CONTRIBUTING.md#requesting-features-in-select2">
         contributing guide.
       </a>
     </p>
@@ -148,7 +148,7 @@ slug: community
 
     <p>
       You can find more information on triaging tickets in the
-      <a href="https://github.com/ivaynberg/select2/blob/master/CONTRIBUTING.md#triaging-issues-and-pull-requests">
+      <a href="https://github.com/select2/select2/blob/master/CONTRIBUTING.md#triaging-issues-and-pull-requests">
         contributing guide.
       </a>
     </p>
diff --git a/docs/examples.html b/docs/examples.html
index cb5faa36..837d45bf 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -178,7 +178,7 @@ $(".js-example-data-array-selected").select2({
 
       <p>
         <select class="js-example-data-ajax form-control">
-          <option value="ivaynberg/select2" selected="selected">ivaynberg/select2</option>
+          <option value="select2/select2" selected="selected">select2/select2</option>
         </select>
       </p>
 
@@ -235,7 +235,7 @@ $(".js-data-example-ajax").select2({
 
 <script type="text/x-example-code" class="js-code-data-ajax-html">
 <select class="js-data-example-ajax">
-  <option value="ivaynberg/select2" selected="selected">ivaynberg/select2</option>
+  <option value="select2/select2" selected="selected">select2/select2</option>
 </select>
 </script>
     </div>
diff --git a/docs/index.html b/docs/index.html
index f9d8c72f..eff18d38 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -15,19 +15,26 @@ slug: home
       </div>
       <div class="col-md-6 jumbotron-side">
         <p>
-          <a href="https://github.com/ivaynberg/select2/tags" class="btn btn-success btn-lg">
+          <a href="announcements-4.0.html" class="btn btn-success btn-lg">
             <i class="fa fa-download fa-lg"></i>
             Download
           </a>
         </p>
         <p>
-          <strong>Version</strong> 4.0.0 <em>alpha</em>
+          <strong>Version</strong> 4.0.0 <em>beta</em>
         </p>
       </div>
     </div>
   </div>
 </main>
 
+<section class="notice-previous">
+  <div class="container">
+    <a href="http://select2.github.io/select2/">Looking for the Select2 3.5.2 docs?</a>
+    We have moved them to a new location while we work on Select2 4.0.
+  </div>
+</section>
+
 <div class="container">
   <section id="lead" class="lead">
     Select2 gives you a customizable select box with support for searching,
@@ -100,7 +107,7 @@ slug: home
 
     <ol>
       <li>
-        <a href="https://github.com/ivaynberg/select2/tags">
+        <a href="https://github.com/select2/select2/tags">
           Download the code
         </a>
         from GitHub and copy the <code>dist</code> directory to your project.
@@ -128,12 +135,12 @@ slug: home
 
     <ul>
       <li>
-        <a href="https://github.com/ivaynberg/select2">
+        <a href="https://github.com/select2/select2">
           Source code, hosted on GitHub
         </a>
       </li>
       <li>
-        <a href="https://github.com/ivaynberg/select2/issues">
+        <a href="https://github.com/select2/select2/issues">
           Bug tracker
         </a>
       </li>
diff --git a/package.json b/package.json
index 54863f8c..6927d6e6 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "Select2",
   "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.",
-  "homepage": "http://ivaynberg.github.io/select2",
+  "homepage": "https://select2.github.io",
   "author": "Igor Vaynberg",
   "repository": {
     "type": "git",
-    "url": "git://github.com/ivaynberg/select2.git"
+    "url": "git://github.com/select2/select2.git"
   },
   "main": "dist/js/select2.js",
-  "version": "3.4.8",
+  "version": "4.0.0",
   "jspm": {
     "main": "select2",
     "files": [
@@ -17,15 +17,6 @@
       "select2.css",
       "select2-spinner.gif"
     ],
-    "shim": {
-      "select2": {
-        "imports": [
-          "jquery",
-          "./select2.css!"
-        ],
-        "exports": "$"
-      }
-    },
     "buildConfig": {
       "uglify": true
     }
diff --git a/select2.jquery.json b/select2.jquery.json
index b005d8a2..f692680b 100644
--- a/select2.jquery.json
+++ b/select2.jquery.json
@@ -26,10 +26,10 @@
             "url": "http://www.gnu.org/licenses/gpl-2.0.html"
         }
     ],
-    "bugs": "https://github.com/ivaynberg/select2/issues",
-    "homepage": "http://ivaynberg.github.com/select2",
-    "docs": "http://ivaynberg.github.com/select2/",
-    "download": "https://github.com/ivaynberg/select2/tags",
+    "bugs": "https://github.com/select2/select2/issues",
+    "homepage": "https://select2.github.io",
+    "docs": "https://select2.github.io",
+    "download": "https://github.com/select2/select2/tags",
     "dependencies": {
         "jquery": ">=1.7.1"
     }