diff --git a/docs/_includes/nav/options-new.html b/docs/_includes/nav/options.html
similarity index 100%
rename from docs/_includes/nav/options-new.html
rename to docs/_includes/nav/options.html
diff --git a/docs/_includes/options-new/compatibility.html b/docs/_includes/options-new/compatibility.html
deleted file mode 100644
index 960b939e..00000000
--- a/docs/_includes/options-new/compatibility.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<section>
-  <h1>
-    Backwards compatibility
-  </h1>
-
-  {% include options-new/compatibility/matcher.html %}
-  {% include options-new/compatibility/initial-selection.html %}
-  {% include options-new/compatibility/query-function.html %}
-  {% include options-new/compatibility/text-input.html %}
-</section>
\ No newline at end of file
diff --git a/docs/_includes/options-new/core.html b/docs/_includes/options-new/core.html
deleted file mode 100644
index f7b3d4c9..00000000
--- a/docs/_includes/options-new/core.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<section>
-  <h1>
-    Core options
-  </h1>
-  
-  {% include options-new/core/options.html %}
-  {% include options-new/core/data-attributes.html %}
-  {% include options-new/core/amd-support.html %}
-</section>
\ No newline at end of file
diff --git a/docs/_includes/options-new/data.html b/docs/_includes/options-new/data.html
deleted file mode 100644
index f6d63ea2..00000000
--- a/docs/_includes/options-new/data.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<section>
-  <h1>
-    Data adapters
-  </h1>
-  
-  {% include options-new/data/select.html %}
-  {% include options-new/data/array.html %}
-  {% include options-new/data/ajax.html %}
-</section>
\ No newline at end of file
diff --git a/docs/_includes/options-new/dropdown.html b/docs/_includes/options-new/dropdown.html
deleted file mode 100644
index f0d4bd85..00000000
--- a/docs/_includes/options-new/dropdown.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<section>
-  <h1 id="results">
-    Displaying results
-  </h1>
-
-  {% include options-new/dropdown/filtering.html %}
-  {% include options-new/dropdown/selections.html %}
-  {% include options-new/dropdown/placement.html %}
-</section>
\ No newline at end of file
diff --git a/docs/_includes/options-new/events.html b/docs/_includes/options-new/events.html
deleted file mode 100644
index 32f347cb..00000000
--- a/docs/_includes/options-new/events.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<section>
-  <h1>
-    Events
-  </h1>
-  
-  {% include options-new/events/jquery.html %}
-  {% include options-new/events/internal.html %}
-</section>
\ No newline at end of file
diff --git a/docs/_includes/options-new/selections.html b/docs/_includes/options-new/selections.html
deleted file mode 100644
index c65e847e..00000000
--- a/docs/_includes/options-new/selections.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<section>
-  <h1 id="selections">
-    Displaying selections
-  </h1>
-  
-  {% include options-new/selections/multiple.html %}
-  {% include options-new/selections/placeholder.html %}
-  {% include options-new/selections/clearing-selections.html %}
-  {% include options-new/selections/templating.html %}
-</section>
\ No newline at end of file
diff --git a/docs/_includes/options/compatibility.html b/docs/_includes/options/compatibility.html
new file mode 100644
index 00000000..a7f6197e
--- /dev/null
+++ b/docs/_includes/options/compatibility.html
@@ -0,0 +1,10 @@
+<section>
+  <h1>
+    Backwards compatibility
+  </h1>
+
+  {% include options/compatibility/matcher.html %}
+  {% include options/compatibility/initial-selection.html %}
+  {% include options/compatibility/query-function.html %}
+  {% include options/compatibility/text-input.html %}
+</section>
\ No newline at end of file
diff --git a/docs/_includes/options-new/compatibility/initial-selection.html b/docs/_includes/options/compatibility/initial-selection.html
similarity index 100%
rename from docs/_includes/options-new/compatibility/initial-selection.html
rename to docs/_includes/options/compatibility/initial-selection.html
diff --git a/docs/_includes/options-new/compatibility/introduction.html b/docs/_includes/options/compatibility/introduction.html
similarity index 100%
rename from docs/_includes/options-new/compatibility/introduction.html
rename to docs/_includes/options/compatibility/introduction.html
diff --git a/docs/_includes/options-new/compatibility/matcher.html b/docs/_includes/options/compatibility/matcher.html
similarity index 100%
rename from docs/_includes/options-new/compatibility/matcher.html
rename to docs/_includes/options/compatibility/matcher.html
diff --git a/docs/_includes/options-new/compatibility/query-function.html b/docs/_includes/options/compatibility/query-function.html
similarity index 100%
rename from docs/_includes/options-new/compatibility/query-function.html
rename to docs/_includes/options/compatibility/query-function.html
diff --git a/docs/_includes/options-new/compatibility/text-input.html b/docs/_includes/options/compatibility/text-input.html
similarity index 100%
rename from docs/_includes/options-new/compatibility/text-input.html
rename to docs/_includes/options/compatibility/text-input.html
diff --git a/docs/_includes/options/core.html b/docs/_includes/options/core.html
new file mode 100644
index 00000000..df834804
--- /dev/null
+++ b/docs/_includes/options/core.html
@@ -0,0 +1,9 @@
+<section>
+  <h1>
+    Core options
+  </h1>
+
+  {% include options/core/options.html %}
+  {% include options/core/data-attributes.html %}
+  {% include options/core/amd-support.html %}
+</section>
\ No newline at end of file
diff --git a/docs/_includes/options-new/core/amd-support.html b/docs/_includes/options/core/amd-support.html
similarity index 100%
rename from docs/_includes/options-new/core/amd-support.html
rename to docs/_includes/options/core/amd-support.html
diff --git a/docs/_includes/options-new/core/data-attributes.html b/docs/_includes/options/core/data-attributes.html
similarity index 100%
rename from docs/_includes/options-new/core/data-attributes.html
rename to docs/_includes/options/core/data-attributes.html
diff --git a/docs/_includes/options-new/core/options.html b/docs/_includes/options/core/options.html
similarity index 100%
rename from docs/_includes/options-new/core/options.html
rename to docs/_includes/options/core/options.html
diff --git a/docs/_includes/options/data.html b/docs/_includes/options/data.html
new file mode 100644
index 00000000..c9c6f684
--- /dev/null
+++ b/docs/_includes/options/data.html
@@ -0,0 +1,9 @@
+<section>
+  <h1>
+    Data adapters
+  </h1>
+
+  {% include options/data/select.html %}
+  {% include options/data/array.html %}
+  {% include options/data/ajax.html %}
+</section>
\ No newline at end of file
diff --git a/docs/_includes/options-new/data/ajax.html b/docs/_includes/options/data/ajax.html
similarity index 98%
rename from docs/_includes/options-new/data/ajax.html
rename to docs/_includes/options/data/ajax.html
index 1160f805..0aa3b117 100644
--- a/docs/_includes/options-new/data/ajax.html
+++ b/docs/_includes/options/data/ajax.html
@@ -19,7 +19,7 @@
     What should the results returned to Select2 look like?
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 
   <h3>
     Is there a way to modify the response before passing it back to Select2?
diff --git a/docs/_includes/options-new/data/array.html b/docs/_includes/options/data/array.html
similarity index 100%
rename from docs/_includes/options-new/data/array.html
rename to docs/_includes/options/data/array.html
diff --git a/docs/_includes/options-new/data/select.html b/docs/_includes/options/data/select.html
similarity index 100%
rename from docs/_includes/options-new/data/select.html
rename to docs/_includes/options/data/select.html
diff --git a/docs/_includes/options/dropdown.html b/docs/_includes/options/dropdown.html
new file mode 100644
index 00000000..b09fb6a3
--- /dev/null
+++ b/docs/_includes/options/dropdown.html
@@ -0,0 +1,9 @@
+<section>
+  <h1 id="results">
+    Displaying results
+  </h1>
+
+  {% include options/dropdown/filtering.html %}
+  {% include options/dropdown/selections.html %}
+  {% include options/dropdown/placement.html %}
+</section>
\ No newline at end of file
diff --git a/docs/_includes/options-new/dropdown/filtering.html b/docs/_includes/options/dropdown/filtering.html
similarity index 72%
rename from docs/_includes/options-new/dropdown/filtering.html
rename to docs/_includes/options/dropdown/filtering.html
index 64ce3d99..054ec19d 100644
--- a/docs/_includes/options-new/dropdown/filtering.html
+++ b/docs/_includes/options/dropdown/filtering.html
@@ -7,17 +7,17 @@
     Can Select2 wait until the user has typed a search term before triggering the request?
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 
   <h3>
     Select2 is allowing long search terms, can this be prevented?
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 
   <h3>
     I only want the search box if there are enough results
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 </section>
\ No newline at end of file
diff --git a/docs/_includes/options-new/dropdown/placement.html b/docs/_includes/options/dropdown/placement.html
similarity index 72%
rename from docs/_includes/options-new/dropdown/placement.html
rename to docs/_includes/options/dropdown/placement.html
index fe247c4f..67c986c7 100644
--- a/docs/_includes/options-new/dropdown/placement.html
+++ b/docs/_includes/options/dropdown/placement.html
@@ -7,23 +7,23 @@
     Can the dropdown be placed directly after the selection container?
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 
   <h3 id="dropdownParent">
     Can I pick an element for the dropdown to be appended to?
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 
   <h3>
     I&apos;m using a Bootstrap modal and I can&apos;t use the search box
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 
   <h3>
     I&apos;m using jQuery UI and I can&apos;t use the search box
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 </section>
\ No newline at end of file
diff --git a/docs/_includes/options-new/dropdown/selections.html b/docs/_includes/options/dropdown/selections.html
similarity index 73%
rename from docs/_includes/options-new/dropdown/selections.html
rename to docs/_includes/options/dropdown/selections.html
index e875e427..bcaf0370 100644
--- a/docs/_includes/options-new/dropdown/selections.html
+++ b/docs/_includes/options/dropdown/selections.html
@@ -7,11 +7,11 @@
     Can I select the highlighted result when the dropdown is closed?
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 
   <h3>
     Can I prevent the dropdown from closing when a result is selected?
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 </section>
\ No newline at end of file
diff --git a/docs/_includes/options/events.html b/docs/_includes/options/events.html
new file mode 100644
index 00000000..ea0dd2c1
--- /dev/null
+++ b/docs/_includes/options/events.html
@@ -0,0 +1,8 @@
+<section>
+  <h1>
+    Events
+  </h1>
+
+  {% include options/events/jquery.html %}
+  {% include options/events/internal.html %}
+</section>
\ No newline at end of file
diff --git a/docs/_includes/options-new/events/internal.html b/docs/_includes/options/events/internal.html
similarity index 100%
rename from docs/_includes/options-new/events/internal.html
rename to docs/_includes/options/events/internal.html
diff --git a/docs/_includes/options-new/events/jquery.html b/docs/_includes/options/events/jquery.html
similarity index 66%
rename from docs/_includes/options-new/events/jquery.html
rename to docs/_includes/options/events/jquery.html
index 5c6cac3d..dd28c077 100644
--- a/docs/_includes/options-new/events/jquery.html
+++ b/docs/_includes/options/events/jquery.html
@@ -7,23 +7,23 @@
     What events will Select2 trigger?
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 
   <h3>
     How can I attach listeners for these events?
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 
   <h3>
     What events does Select2 listen for?
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 
   <h3>
     What events can be prevented? How can I prevent a selection from being made?
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 </section>
\ No newline at end of file
diff --git a/docs/_includes/options-new/introduction.html b/docs/_includes/options/introduction.html
similarity index 100%
rename from docs/_includes/options-new/introduction.html
rename to docs/_includes/options/introduction.html
diff --git a/docs/_includes/options-new/not-written.html b/docs/_includes/options/not-written.html
similarity index 100%
rename from docs/_includes/options-new/not-written.html
rename to docs/_includes/options/not-written.html
diff --git a/docs/_includes/options/selections.html b/docs/_includes/options/selections.html
new file mode 100644
index 00000000..086c2aec
--- /dev/null
+++ b/docs/_includes/options/selections.html
@@ -0,0 +1,10 @@
+<section>
+  <h1 id="selections">
+    Displaying selections
+  </h1>
+
+  {% include options/selections/multiple.html %}
+  {% include options/selections/placeholder.html %}
+  {% include options/selections/clearing-selections.html %}
+  {% include options/selections/templating.html %}
+</section>
\ No newline at end of file
diff --git a/docs/_includes/options-new/selections/clearing-selections.html b/docs/_includes/options/selections/clearing-selections.html
similarity index 73%
rename from docs/_includes/options-new/selections/clearing-selections.html
rename to docs/_includes/options/selections/clearing-selections.html
index ae3ac7d7..2e81614b 100644
--- a/docs/_includes/options-new/selections/clearing-selections.html
+++ b/docs/_includes/options/selections/clearing-selections.html
@@ -7,11 +7,11 @@
     The "x" icon is not clearing the selection
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 
   <h3>
     Can users remove all of their selections in a multiple select at once?
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 </section>
\ No newline at end of file
diff --git a/docs/_includes/options-new/selections/multiple.html b/docs/_includes/options/selections/multiple.html
similarity index 100%
rename from docs/_includes/options-new/selections/multiple.html
rename to docs/_includes/options/selections/multiple.html
diff --git a/docs/_includes/options-new/selections/placeholder.html b/docs/_includes/options/selections/placeholder.html
similarity index 100%
rename from docs/_includes/options-new/selections/placeholder.html
rename to docs/_includes/options/selections/placeholder.html
diff --git a/docs/_includes/options-new/selections/templating.html b/docs/_includes/options/selections/templating.html
similarity index 72%
rename from docs/_includes/options-new/selections/templating.html
rename to docs/_includes/options/selections/templating.html
index 460431a5..7063561a 100644
--- a/docs/_includes/options-new/selections/templating.html
+++ b/docs/_includes/options/selections/templating.html
@@ -7,17 +7,17 @@
     Nothing is being displayed when I select an option
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 
   <h3>
     I am using HTML in my selection template but it isn't displaying it
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 
   <h3>
     How can I access the container where the selection is displayed?
   </h3>
 
-  {% include options-new/not-written.html %}
+  {% include options/not-written.html %}
 </section>
\ No newline at end of file
diff --git a/docs/options-new.html b/docs/options.html
similarity index 59%
rename from docs/options-new.html
rename to docs/options.html
index 8ee74a82..5670c1cf 100644
--- a/docs/options-new.html
+++ b/docs/options.html
@@ -18,16 +18,16 @@ slug: options
 <div class="container s2-docs-container">
   <div class="row">
     <div class="col-md-9" role="main">
-      {% include options-new/introduction.html %}
-      {% include options-new/core.html %}
-      {% include options-new/data.html %}
-      {% include options-new/selections.html %}
-      {% include options-new/dropdown.html %}
-      {% include options-new/events.html %}
-      {% include options-new/compatibility.html %}
+      {% include options/introduction.html %}
+      {% include options/core.html %}
+      {% include options/data.html %}
+      {% include options/selections.html %}
+      {% include options/dropdown.html %}
+      {% include options/events.html %}
+      {% include options/compatibility.html %}
     </div>
     <div class="col-md-3" role="complementary">
-      {% include nav/options-new.html %}
+      {% include nav/options.html %}
     </div>
   </div>
 </div>