diff --git a/bower.json b/bower.json
index 54d44c45..e48932ce 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,14 @@
 {
     "name": "select2",
-    "version": "3.5.2",
-    "main": ["select2.js", "select2.css", "select2.png", "select2x2.png", "select2-spinner.gif"],
+    "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.",
+    "main": [
+        "dist/js/select2.js",
+        "dist/css/select2.css"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "git@github.com:select2/select2.git"
+    },
     "dependencies": {
         "jquery": ">= 1.7.1"
     }
diff --git a/component.json b/component.json
index c11b18b5..fe2c70d3 100644
--- a/component.json
+++ b/component.json
@@ -2,65 +2,18 @@
   "name": "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",
+  "version": "4.0.0-beta.1",
   "demo": "https://select2.github.io/",
   "keywords": [
     "jquery"
   ],
-  "main": "select2.js",
+  "main": "dist/js/select2.js",
   "styles": [
-    "select2.css",
-    "select2-bootstrap.css"
+    "dist/css/select2.css"
   ],
   "scripts": [
-    "select2.js",
-    "select2_locale_ar.js",
-    "select2_locale_bg.js",
-    "select2_locale_ca.js",
-    "select2_locale_cs.js",
-    "select2_locale_da.js",
-    "select2_locale_de.js",
-    "select2_locale_el.js",
-    "select2_locale_es.js",
-    "select2_locale_et.js",
-    "select2_locale_eu.js",
-    "select2_locale_fa.js",
-    "select2_locale_fi.js",
-    "select2_locale_fr.js",
-    "select2_locale_gl.js",
-    "select2_locale_he.js",
-    "select2_locale_hr.js",
-    "select2_locale_hu.js",
-    "select2_locale_id.js",
-    "select2_locale_is.js",
-    "select2_locale_it.js",
-    "select2_locale_ja.js",
-    "select2_locale_ka.js",
-    "select2_locale_ko.js",
-    "select2_locale_lt.js",
-    "select2_locale_lv.js",
-    "select2_locale_mk.js",
-    "select2_locale_ms.js",
-    "select2_locale_nl.js",
-    "select2_locale_no.js",
-    "select2_locale_pl.js",
-    "select2_locale_pt-BR.js",
-    "select2_locale_pt-PT.js",
-    "select2_locale_ro.js",
-    "select2_locale_ru.js",
-    "select2_locale_sk.js",
-    "select2_locale_sv.js",
-    "select2_locale_th.js",
-    "select2_locale_tr.js",
-    "select2_locale_uk.js",
-    "select2_locale_vi.js",
-    "select2_locale_zh-CN.js",
-    "select2_locale_zh-TW.js"
-  ],
-  "images": [
-    "select2-spinner.gif",
-    "select2.png",
-    "select2x2.png"
+    "dist/js/select2.js",
+    "dist/js/i18n/*.js"
   ],
   "license": "MIT"
 }
diff --git a/composer.json b/composer.json
index 70b85749..d836738c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,9 @@
 {
   "name": "select2/select2",
   "description": "Select2 is a jQuery based replacement for select boxes.",
-  "version": "3.5.2",
   "type": "component",
   "homepage": "https://select2.github.io/",
-  "license": "Apache-2.0",
+  "license": "MIT",
   "require": {
     "robloach/component-installer": "*",
     "components/jquery": ">=1.7.1"
@@ -12,16 +11,12 @@
   "extra": {
     "component": {
       "scripts": [
-        "select2.js"
+        "dist/js/select2.js"
       ],
       "files": [
-        "select2.js",
-        "select2_locale_*.js",
-        "select2.css",
-        "select2-bootstrap.css",
-        "select2-spinner.gif",
-        "select2.png",
-        "select2x2.png"
+        "dist/js/select2.js",
+        "dist/js/i18n/*.js",
+        "dist/css/select2.css"
       ]
     }
   }
diff --git a/package.json b/package.json
index 6927d6e6..1f56d692 100644
--- a/package.json
+++ b/package.json
@@ -7,19 +7,26 @@
     "type": "git",
     "url": "git://github.com/select2/select2.git"
   },
+  "bugs": {
+    "url": "https://github.com/select2/select2/issues"
+  },
+  "keywords": [
+    "select",
+    "autocomplete",
+    "typeahead",
+    "dropdown",
+    "multiselect",
+    "tag",
+    "tagging"
+  ],
+  "license": "MIT",
   "main": "dist/js/select2.js",
-  "version": "4.0.0",
+  "version": "4.0.0-beta.1",
   "jspm": {
-    "main": "select2",
-    "files": [
-      "select2.js",
-      "select2.png",
-      "select2.css",
-      "select2-spinner.gif"
-    ],
-    "buildConfig": {
-      "uglify": true
-    }
+    "main": "js/select2",
+    "directories": {
+      "lib": "dist"
+    },
   },
   "devDependencies": {
     "grunt": "^0.4.5",
diff --git a/select2.jquery.json b/select2.jquery.json
index f692680b..afb95ca0 100644
--- a/select2.jquery.json
+++ b/select2.jquery.json
@@ -11,25 +11,21 @@
         "tag",
         "tagging"
     ],
-    "version": "3.5.2",
+    "version": "4.0.0-beta.1",
     "author": {
         "name": "Igor Vaynberg",
         "url": "https://github.com/ivaynberg"
     },
     "licenses": [
         {
-            "type": "Apache",
-            "url": "http://www.apache.org/licenses/LICENSE-2.0"
-        },
-        {
-            "type": "GPL v2",
-            "url": "http://www.gnu.org/licenses/gpl-2.0.html"
+            "type": "MIT",
+            "url": "http://opensource.org/licenses/MIT"
         }
     ],
     "bugs": "https://github.com/select2/select2/issues",
     "homepage": "https://select2.github.io",
     "docs": "https://select2.github.io",
-    "download": "https://github.com/select2/select2/tags",
+    "download": "https://github.com/select2/select2/releases",
     "dependencies": {
         "jquery": ">=1.7.1"
     }