diff --git a/build/joomla-split.sh b/build/joomla-split.sh
index 3185ee40e..9203ad8b4 100644
--- a/build/joomla-split.sh
+++ b/build/joomla-split.sh
@@ -10,6 +10,7 @@ git subsplit publish "
 	src/Joomla/Data:git@github.com:joomla/joomla-framework-data.git
 	src/Joomla/Database:git@github.com:joomla/joomla-framework-database.git
 	src/Joomla/Date:git@github.com:joomla/joomla-framework-date.git
+	src/Joomla/DI:git@github.com:joomla/joomla-framework-di.git
 	src/Joomla/Event:git@github.com:joomla/joomla-framework-event.git
 	src/Joomla/Facebook:git@github.com:joomla/joomla-framework-facebook.git
 	src/Joomla/Filesystem:git@github.com:joomla/joomla-framework-filesystem.git
diff --git a/src/Joomla/Application/composer.json b/src/Joomla/Application/composer.json
index 51b11d7f0..805592b8a 100644
--- a/src/Joomla/Application/composer.json
+++ b/src/Joomla/Application/composer.json
@@ -7,20 +7,19 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/input": "dev-master",
-        "joomla/session": "dev-master",
-        "joomla/string": "dev-master",
-        "joomla/registry": "dev-master",
-        "joomla/uri": "dev-master",
-        "joomla/filesystem": "dev-master",
+        "joomla/input": "1.*",
+        "joomla/session": "1.*",
+        "joomla/string": "1.*",
+        "joomla/registry": "1.*",
+        "joomla/uri": "1.*",
+        "joomla/filesystem": "1.*",
         "psr/log": "~1.0"
     },
     "require-dev": {
-        "joomla/controller": "dev-master",
-        "joomla/test": "dev-master"
+        "joomla/controller": "1.*",
+        "joomla/test": "1.*"
     },
     "target-dir": "Joomla/Application",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Application": ""
diff --git a/src/Joomla/Archive/composer.json b/src/Joomla/Archive/composer.json
index 41301fb98..b50dc96bf 100644
--- a/src/Joomla/Archive/composer.json
+++ b/src/Joomla/Archive/composer.json
@@ -7,10 +7,9 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/filesystem": "dev-master"
+        "joomla/filesystem": "1.*"
     },
     "target-dir": "Joomla/Archive",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Archive": ""
diff --git a/src/Joomla/Cache/composer.json b/src/Joomla/Cache/composer.json
index 1eb680203..677bf8f41 100644
--- a/src/Joomla/Cache/composer.json
+++ b/src/Joomla/Cache/composer.json
@@ -9,13 +9,12 @@
         "php": ">=5.3.10"
     },
     "require-dev": {
-         "joomla/test": "dev-master"
+         "joomla/test": "1.*"
     },
     "suggest": {
         "joomla/registry": "Registry can be used as an alternative to using an array for the caching options."
     },
     "target-dir": "Joomla/Cache",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Cache": ""
diff --git a/src/Joomla/Client/composer.json b/src/Joomla/Client/composer.json
index 938bb373e..57e6a1e8b 100644
--- a/src/Joomla/Client/composer.json
+++ b/src/Joomla/Client/composer.json
@@ -7,10 +7,9 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/log": "dev-master"
+        "joomla/log": "1.*"
     },
     "target-dir": "Joomla/Client",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Client": ""
diff --git a/src/Joomla/Controller/composer.json b/src/Joomla/Controller/composer.json
index 5b3303496..129ab96fe 100644
--- a/src/Joomla/Controller/composer.json
+++ b/src/Joomla/Controller/composer.json
@@ -9,16 +9,15 @@
         "php": ">=5.3.10"
     },
     "require-dev": {
-        "joomla/application": "dev-master",
-        "joomla/input": "dev-master",
-        "joomla/test": "dev-master"
+        "joomla/application": "1.*",
+        "joomla/input": "1.*",
+        "joomla/test": "1.*"
     },
     "suggest": {
-    	"joomla/application": "dev-master",
-    	"joomla/input": "dev-master"
+    	"joomla/application": "1.*",
+    	"joomla/input": "1.*"
     },
     "target-dir": "Joomla/Controller",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Controller": ""
diff --git a/src/Joomla/Crypt/composer.json b/src/Joomla/Crypt/composer.json
index a3c5acc9e..8e9890a5e 100644
--- a/src/Joomla/Crypt/composer.json
+++ b/src/Joomla/Crypt/composer.json
@@ -9,7 +9,6 @@
         "php": ">=5.3.10"
     },
     "target-dir": "Joomla/Crypt",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Crypt": ""
diff --git a/src/Joomla/Data/composer.json b/src/Joomla/Data/composer.json
index ee8c53e17..70cbb96fb 100644
--- a/src/Joomla/Data/composer.json
+++ b/src/Joomla/Data/composer.json
@@ -7,14 +7,13 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/compat": "dev-master",
-        "joomla/registry": "dev-master"
+        "joomla/compat": "1.*",
+        "joomla/registry": "1.*"
     },
     "require-dev": {
-        "joomla/test": "dev-master"
+        "joomla/test": "1.*"
     },
     "target-dir": "Joomla/Data",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Data": ""
diff --git a/src/Joomla/Database/composer.json b/src/Joomla/Database/composer.json
index 594698efd..8904d5922 100644
--- a/src/Joomla/Database/composer.json
+++ b/src/Joomla/Database/composer.json
@@ -10,7 +10,7 @@
         "psr/log": "~1.0"
     },
     "require-dev": {
-        "joomla/test": "dev-master"
+        "joomla/test": "1.*"
     },
     "target-dir": "Joomla/Database",
     "autoload": {
diff --git a/src/Joomla/Facebook/composer.json b/src/Joomla/Facebook/composer.json
index da390ff5b..e57e35e14 100644
--- a/src/Joomla/Facebook/composer.json
+++ b/src/Joomla/Facebook/composer.json
@@ -7,11 +7,11 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/oauth2": "dev-master",
-        "joomla/input": "dev-master",
-        "joomla/http": "dev-master",
-        "joomla/registry": "dev-master",
-        "joomla/uri": "dev-master"
+        "joomla/oauth2": "1.*",
+        "joomla/input": "1.*",
+        "joomla/http": "1.*",
+        "joomla/registry": "1.*",
+        "joomla/uri": "1.*"
     },
     "target-dir": "Joomla/Facebook",
     "autoload": {
diff --git a/src/Joomla/Filesystem/composer.json b/src/Joomla/Filesystem/composer.json
index 5b1282b89..03f191233 100644
--- a/src/Joomla/Filesystem/composer.json
+++ b/src/Joomla/Filesystem/composer.json
@@ -7,11 +7,10 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/log": "dev-master",
-        "joomla/client": "dev-master"
+        "joomla/log": "1.*",
+        "joomla/client": "1.*"
     },
     "target-dir": "Joomla/Filesystem",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Filesystem": ""
diff --git a/src/Joomla/Filter/composer.json b/src/Joomla/Filter/composer.json
index 569c1dd4d..9efbc9a8e 100644
--- a/src/Joomla/Filter/composer.json
+++ b/src/Joomla/Filter/composer.json
@@ -7,16 +7,15 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/string": "dev-master"
+        "joomla/string": "1.*"
     },
     "require-dev": {
-        "joomla/language": "dev-master"
+        "joomla/language": "1.*"
     },
     "suggest": {
         "joomla/language": "Required only if you want to use `OutputFilter::stringURLSafe`."
     },
     "target-dir": "Joomla/Filter",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Filter": ""
diff --git a/src/Joomla/Form/composer.json b/src/Joomla/Form/composer.json
index e9955e937..b1c1c5e62 100644
--- a/src/Joomla/Form/composer.json
+++ b/src/Joomla/Form/composer.json
@@ -7,16 +7,15 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/language": "dev-master",
-        "joomla/string": "dev-master",
-        "joomla/uri": "dev-master",
-        "joomla/filter": "dev-master",
-        "joomla/filesystem": "dev-master",
-        "joomla/registry": "dev-master",
-        "joomla/utilities": "dev-master"
+        "joomla/language": "1.*",
+        "joomla/string": "1.*",
+        "joomla/uri": "1.*",
+        "joomla/filter": "1.*",
+        "joomla/filesystem": "1.*",
+        "joomla/registry": "1.*",
+        "joomla/utilities": "1.*"
     },
     "target-dir": "Joomla/Form",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Form": ""
diff --git a/src/Joomla/Github/composer.json b/src/Joomla/Github/composer.json
index 7f0f4fb32..d09664b45 100644
--- a/src/Joomla/Github/composer.json
+++ b/src/Joomla/Github/composer.json
@@ -7,13 +7,12 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/date": "dev-master",
-        "joomla/http": "dev-master",
-        "joomla/registry": "dev-master",
-        "joomla/uri": "dev-master"
+        "joomla/date": "1.*",
+        "joomla/http": "1.*",
+        "joomla/registry": "1.*",
+        "joomla/uri": "1.*"
     },
     "target-dir": "Joomla/Github",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Github": ""
diff --git a/src/Joomla/Google/composer.json b/src/Joomla/Google/composer.json
index 15caa2043..73a3f749d 100644
--- a/src/Joomla/Google/composer.json
+++ b/src/Joomla/Google/composer.json
@@ -7,17 +7,16 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/registry": "dev-master",
-        "joomla/uri": "dev-master",
-        "joomla/oauth2": "dev-master",
-        "joomla/filesystem": "dev-master"
+        "joomla/registry": "1.*",
+        "joomla/uri": "1.*",
+        "joomla/oauth2": "1.*",
+        "joomla/filesystem": "1.*"
     },
     "require-dev": {
-    	"joomla/input": "dev-master",
-    	"joomla/test": "dev-master"
+    	"joomla/input": "1.*",
+    	"joomla/test": "1.*"
     },
     "target-dir": "Joomla/Google",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Google": ""
diff --git a/src/Joomla/Http/composer.json b/src/Joomla/Http/composer.json
index fc5ea11fa..9cf80fde5 100644
--- a/src/Joomla/Http/composer.json
+++ b/src/Joomla/Http/composer.json
@@ -7,11 +7,10 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/registry": "dev-master",
-        "joomla/uri": "dev-master"
+        "joomla/registry": "1.*",
+        "joomla/uri": "1.*"
     },
     "target-dir": "Joomla/Http",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Http": ""
diff --git a/src/Joomla/Image/composer.json b/src/Joomla/Image/composer.json
index 1a9f2a5a9..3e5f0f900 100644
--- a/src/Joomla/Image/composer.json
+++ b/src/Joomla/Image/composer.json
@@ -11,10 +11,9 @@
         "psr/log": "~1.0"
     },
     "require-dev": {
-        "joomla/test": "dev-master"
+        "joomla/test": "1.*"
     },
     "target-dir": "Joomla/Image",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Image": ""
diff --git a/src/Joomla/Input/composer.json b/src/Joomla/Input/composer.json
index 1dc0f8402..ab262a180 100644
--- a/src/Joomla/Input/composer.json
+++ b/src/Joomla/Input/composer.json
@@ -7,13 +7,12 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/filter": "dev-master"
+        "joomla/filter": "1.*"
     },
     "require-dev": {
-    	"joomla/test": "dev-master"
+    	"joomla/test": "1.*"
     },
     "target-dir": "Joomla/Input",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Input": ""
diff --git a/src/Joomla/Keychain/composer.json b/src/Joomla/Keychain/composer.json
index 4f6ae3304..62906580c 100644
--- a/src/Joomla/Keychain/composer.json
+++ b/src/Joomla/Keychain/composer.json
@@ -7,10 +7,9 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/registry": "dev-master"
+        "joomla/registry": "1.*"
     },
     "target-dir": "Joomla/Keychain",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Keychain": ""
diff --git a/src/Joomla/Language/composer.json b/src/Joomla/Language/composer.json
index 3f7e13bc3..aadaea07b 100644
--- a/src/Joomla/Language/composer.json
+++ b/src/Joomla/Language/composer.json
@@ -7,14 +7,13 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/string": "dev-master"
+        "joomla/string": "1.*"
     },
     "require-dev": {
-        "joomla/filesystem": "dev-master",
-        "joomla/test": "dev-master"
+        "joomla/filesystem": "1.*",
+        "joomla/test": "1.*"
     },
     "target-dir": "Joomla/Language",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Language": ""
diff --git a/src/Joomla/Linkedin/composer.json b/src/Joomla/Linkedin/composer.json
index 4566c9e50..3d026f775 100644
--- a/src/Joomla/Linkedin/composer.json
+++ b/src/Joomla/Linkedin/composer.json
@@ -7,10 +7,10 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/oauth1": "dev-master",
-        "joomla/input": "dev-master",
-        "joomla/http": "dev-master",
-        "joomla/registry": "dev-master"
+        "joomla/oauth1": "1.*",
+        "joomla/input": "1.*",
+        "joomla/http": "1.*",
+        "joomla/registry": "1.*"
     },
     "target-dir": "Joomla/Linkedin",
     "autoload": {
diff --git a/src/Joomla/Log/composer.json b/src/Joomla/Log/composer.json
index d9dbc55a7..cf7909f90 100644
--- a/src/Joomla/Log/composer.json
+++ b/src/Joomla/Log/composer.json
@@ -7,14 +7,13 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/date": "dev-master",
-        "joomla/filesystem": "dev-master"
+        "joomla/date": "1.*",
+        "joomla/filesystem": "1.*"
     },
     "require-dev": {
-        "joomla/database": "dev-master"
+        "joomla/database": "1.*"
     },
     "target-dir": "Joomla/Log",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Log": ""
diff --git a/src/Joomla/Model/composer.json b/src/Joomla/Model/composer.json
index 008f16496..98b2f25be 100644
--- a/src/Joomla/Model/composer.json
+++ b/src/Joomla/Model/composer.json
@@ -7,14 +7,13 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/registry": "dev-master",
-        "joomla/database": "dev-master"
+        "joomla/registry": "1.*",
+        "joomla/database": "1.*"
     },
     "require-dev": {
-        "joomla/test": "dev-master"
+        "joomla/test": "1.*"
     },
     "target-dir": "Joomla/Model",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Model": ""
diff --git a/src/Joomla/Oauth1/composer.json b/src/Joomla/Oauth1/composer.json
index 921e3527a..9bc851f55 100644
--- a/src/Joomla/Oauth1/composer.json
+++ b/src/Joomla/Oauth1/composer.json
@@ -7,10 +7,10 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/application": "dev-master",
-        "joomla/http": "dev-master",
-        "joomla/input": "dev-master",
-        "joomla/registry": "dev-master"
+        "joomla/application": "1.*",
+        "joomla/http": "1.*",
+        "joomla/input": "1.*",
+        "joomla/registry": "1.*"
     },
     "target-dir": "Joomla/OAuth1",
     "autoload": {
diff --git a/src/Joomla/Oauth2/composer.json b/src/Joomla/Oauth2/composer.json
index 24eceba9e..fc387e4cf 100644
--- a/src/Joomla/Oauth2/composer.json
+++ b/src/Joomla/Oauth2/composer.json
@@ -7,16 +7,15 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/application": "dev-master",
-        "joomla/http": "dev-master",
-        "joomla/input": "dev-master",
-        "joomla/registry": "dev-master"
+        "joomla/application": "1.*",
+        "joomla/http": "1.*",
+        "joomla/input": "1.*",
+        "joomla/registry": "1.*"
     },
     "require-dev": {
-        "joomla/test": "dev-master"
+        "joomla/test": "1.*"
     },
     "target-dir": "Joomla/OAuth2",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Oauth2": ""
diff --git a/src/Joomla/Profiler/composer.json b/src/Joomla/Profiler/composer.json
index c4f970904..19b791acd 100644
--- a/src/Joomla/Profiler/composer.json
+++ b/src/Joomla/Profiler/composer.json
@@ -9,10 +9,9 @@
         "php": ">=5.3.10"
     },
     "require-dev": {
-        "joomla/test": "dev-master"
+        "joomla/test": "1.*"
     },
     "target-dir": "Joomla/Profiler",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Profiler": ""
diff --git a/src/Joomla/Registry/composer.json b/src/Joomla/Registry/composer.json
index 584552e5f..caf77b361 100644
--- a/src/Joomla/Registry/composer.json
+++ b/src/Joomla/Registry/composer.json
@@ -7,18 +7,17 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-         "joomla/compat": "dev-master",
-         "joomla/utilities": "dev-master"
+         "joomla/compat": "1.*",
+         "joomla/utilities": "1.*"
     },
     "require-dev": {
          "symfony/yaml": "~2.0",
-         "joomla/test": "dev-master"
+         "joomla/test": "1.*"
     },
     "suggest": {
         "symfony/yaml": "Install 2.* if you require YAML support."
     },
     "target-dir": "Joomla/Registry",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Registry": ""
diff --git a/src/Joomla/Router/composer.json b/src/Joomla/Router/composer.json
index 8e52d76de..65b3f7512 100644
--- a/src/Joomla/Router/composer.json
+++ b/src/Joomla/Router/composer.json
@@ -7,14 +7,13 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-    	"joomla/controller": "dev-master",
-    	"joomla/input": "dev-master"
+    	"joomla/controller": "1.*",
+    	"joomla/input": "1.*"
     },
     "require-dev": {
-    	"joomla/test": "dev-master"
+    	"joomla/test": "1.*"
     },
     "target-dir": "Joomla/Router",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Router": ""
diff --git a/src/Joomla/Session/composer.json b/src/Joomla/Session/composer.json
index e0d21e7de..e0877f0c6 100644
--- a/src/Joomla/Session/composer.json
+++ b/src/Joomla/Session/composer.json
@@ -7,7 +7,7 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/filter": "dev-master"
+        "joomla/filter": "1.*"
     },
     "target-dir": "Joomla/Session",
     "autoload": {
diff --git a/src/Joomla/Utilities/composer.json b/src/Joomla/Utilities/composer.json
index 690598645..d85ce25d8 100644
--- a/src/Joomla/Utilities/composer.json
+++ b/src/Joomla/Utilities/composer.json
@@ -7,10 +7,9 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-         "joomla/string": "dev-master"
+         "joomla/string": "1.*"
     },
     "target-dir": "Joomla/Utilities",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\Utilities": ""
diff --git a/src/Joomla/View/composer.json b/src/Joomla/View/composer.json
index 9e395155e..e536c054c 100644
--- a/src/Joomla/View/composer.json
+++ b/src/Joomla/View/composer.json
@@ -7,14 +7,13 @@
     "license": "GPL-2.0+",
     "require": {
         "php": ">=5.3.10",
-        "joomla/filesystem": "dev-master",
-        "joomla/model": "dev-master"
+        "joomla/filesystem": "1.*",
+        "joomla/model": "1.*"
     },
     "require-dev": {
-        "joomla/test": "dev-master"
+        "joomla/test": "1.*"
     },
     "target-dir": "Joomla/View",
-    "minimum-stability": "dev",
     "autoload": {
     	"psr-0": {
     		"Joomla\\View": ""