diff --git a/plugin.xml b/plugin.xml
index 751296f..d710d69 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -2,9 +2,9 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="net.yoik.cordova.plugins.screenorientation"
-    version="1.1.1">
+    version="1.1.2">
 
-    <name>Yoik Screen Orientation</name>
+    <name>Screen Orientation</name>
     <description>Adds Screen Orientation API lock and unlock functions to the global screen object in android, iOS and BB10.</description>
     <license>MIT</license>
 
@@ -37,6 +37,9 @@
                 <param name="android-package" value="net.yoik.cordova.plugins.screenorientation.YoikScreenOrientation" />
             </feature>
         </config-file>
+        <js-module src="www/screenorientation.android.js" name="screenorientation.android">
+            <merges target="cordova.plugins.screenorientation" />
+        </js-module>
     </platform>
 
     <platform name="blackberry10">
diff --git a/www/screenorientation.android.js b/www/screenorientation.android.js
new file mode 100644
index 0000000..334b900
--- /dev/null
+++ b/www/screenorientation.android.js
@@ -0,0 +1,8 @@
+var exec = require('cordova/exec'),
+    screenOrientation = {};
+
+screenOrientation.setOrientation = function(orientation) {
+    exec(null, null, "YoikScreenOrientation", "screenOrientation", ['set', orientation]);
+};
+
+module.exports = screenOrientation;
\ No newline at end of file
diff --git a/www/screenorientation.bb10.js b/www/screenorientation.bb10.js
index c3b56c6..51bf3ea 100644
--- a/www/screenorientation.bb10.js
+++ b/www/screenorientation.bb10.js
@@ -1,27 +1,3 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2014
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-
 var screenOrientation = {};
 
 screenOrientation.setOrientation = function(orientation) {
diff --git a/www/screenorientation.ios.js b/www/screenorientation.ios.js
index 980c69b..50e2c6e 100644
--- a/www/screenorientation.ios.js
+++ b/www/screenorientation.ios.js
@@ -1,26 +1,11 @@
-/*
-The MIT License (MIT)
+var exec = require('cordova/exec'),
+    screenOrientation = {};
 
-Copyright (c) 2014
+screenOrientation.setOrientation = function(orientation) {
+    exec(null, null, "YoikScreenOrientation", "screenOrientation", ['set', orientation]);
+};
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
+module.exports = screenOrientation;
 
 // ios orientation callback/hook
 window.shouldRotateToOrientation = function(orientation) {
@@ -47,6 +32,4 @@ window.shouldRotateToOrientation = function(orientation) {
         break;
     }
     return false;
-};
-
-module.exports = {};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/www/screenorientation.js b/www/screenorientation.js
index 1d431f5..eb5df68 100644
--- a/www/screenorientation.js
+++ b/www/screenorientation.js
@@ -21,9 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
-var argscheck = require('cordova/argscheck'),
-    exec = require('cordova/exec'),
-    screenOrientation = {},
+var screenOrientation = {},
     Orientations = [
         'portrait-primary',
         // The orientation is in the primary portrait mode.
@@ -43,7 +41,8 @@ screenOrientation.Orientations = Orientations;
 screenOrientation.currOrientation = 'unlocked';
 
 screenOrientation.setOrientation = function(orientation) {
-    exec(null, null, "YoikScreenOrientation", "screenOrientation", ['set', orientation]);
+    //platform specific files override this function
+    console.log('setOrientation not supported on device');
 };
 
 function addScreenOrientationApi(obj) {