diff --git a/src/bower_components/emby-apiclient/apiclientex.js b/src/bower_components/apiclient/apiclient.js
similarity index 98%
rename from src/bower_components/emby-apiclient/apiclientex.js
rename to src/bower_components/apiclient/apiclient.js
index b6a0c1bb14..98aaed75e3 100644
--- a/src/bower_components/emby-apiclient/apiclientex.js
+++ b/src/bower_components/apiclient/apiclient.js
@@ -1,6 +1,11 @@
-define(["apiclientcore", "localassetmanager"], function(ApiClient, localassetmanager) {
+//TODO: (vitorsemeano) modify this lines for webpack
+define(["bower_components/apiclient/apiclientcore", "localassetmanager"], function(ApiClient, localassetmanager) {
     "use strict";
 
+    if ("cordova" !== window.appMode && "android" !== window.appMode) {
+        return ApiClient;
+    }
+
     function isLocalId(str) {
         return startsWith(str, localPrefix)
     }
diff --git a/src/bower_components/emby-apiclient/apiclient.js b/src/bower_components/apiclient/apiclientcore.js
similarity index 100%
rename from src/bower_components/emby-apiclient/apiclient.js
rename to src/bower_components/apiclient/apiclientcore.js
diff --git a/src/bower_components/emby-apiclient/appstorage-cache.js b/src/bower_components/apiclient/appstorage-cache.js
similarity index 100%
rename from src/bower_components/emby-apiclient/appstorage-cache.js
rename to src/bower_components/apiclient/appstorage-cache.js
diff --git a/src/bower_components/emby-apiclient/appstorage-localstorage.js b/src/bower_components/apiclient/appstorage-localstorage.js
similarity index 100%
rename from src/bower_components/emby-apiclient/appstorage-localstorage.js
rename to src/bower_components/apiclient/appstorage-localstorage.js
diff --git a/src/bower_components/emby-apiclient/appstorage-memory.js b/src/bower_components/apiclient/appstorage-memory.js
similarity index 100%
rename from src/bower_components/emby-apiclient/appstorage-memory.js
rename to src/bower_components/apiclient/appstorage-memory.js
diff --git a/src/bower_components/emby-apiclient/connectionmanager.js b/src/bower_components/apiclient/connectionmanager.js
similarity index 100%
rename from src/bower_components/emby-apiclient/connectionmanager.js
rename to src/bower_components/apiclient/connectionmanager.js
diff --git a/src/bower_components/emby-apiclient/credentials.js b/src/bower_components/apiclient/credentials.js
similarity index 100%
rename from src/bower_components/emby-apiclient/credentials.js
rename to src/bower_components/apiclient/credentials.js
diff --git a/src/bower_components/emby-apiclient/events.js b/src/bower_components/apiclient/events.js
similarity index 100%
rename from src/bower_components/emby-apiclient/events.js
rename to src/bower_components/apiclient/events.js
diff --git a/src/bower_components/emby-apiclient/localassetmanager.js b/src/bower_components/apiclient/localassetmanager.js
similarity index 100%
rename from src/bower_components/emby-apiclient/localassetmanager.js
rename to src/bower_components/apiclient/localassetmanager.js
diff --git a/src/bower_components/apiclient/package.json b/src/bower_components/apiclient/package.json
new file mode 100644
index 0000000000..0069cfc6bf
--- /dev/null
+++ b/src/bower_components/apiclient/package.json
@@ -0,0 +1,3 @@
+{
+    "main": "apiclient.js"
+}
\ No newline at end of file
diff --git a/src/bower_components/emby-apiclient/sync/filerepository.js b/src/bower_components/apiclient/sync/filerepository.js
similarity index 100%
rename from src/bower_components/emby-apiclient/sync/filerepository.js
rename to src/bower_components/apiclient/sync/filerepository.js
diff --git a/src/bower_components/emby-apiclient/sync/itemrepository.js b/src/bower_components/apiclient/sync/itemrepository.js
similarity index 100%
rename from src/bower_components/emby-apiclient/sync/itemrepository.js
rename to src/bower_components/apiclient/sync/itemrepository.js
diff --git a/src/bower_components/emby-apiclient/sync/localsync.js b/src/bower_components/apiclient/sync/localsync.js
similarity index 100%
rename from src/bower_components/emby-apiclient/sync/localsync.js
rename to src/bower_components/apiclient/sync/localsync.js
diff --git a/src/bower_components/emby-apiclient/sync/mediasync.js b/src/bower_components/apiclient/sync/mediasync.js
similarity index 100%
rename from src/bower_components/emby-apiclient/sync/mediasync.js
rename to src/bower_components/apiclient/sync/mediasync.js
diff --git a/src/bower_components/emby-apiclient/sync/multiserversync.js b/src/bower_components/apiclient/sync/multiserversync.js
similarity index 100%
rename from src/bower_components/emby-apiclient/sync/multiserversync.js
rename to src/bower_components/apiclient/sync/multiserversync.js
diff --git a/src/bower_components/emby-apiclient/sync/serversync.js b/src/bower_components/apiclient/sync/serversync.js
similarity index 100%
rename from src/bower_components/emby-apiclient/sync/serversync.js
rename to src/bower_components/apiclient/sync/serversync.js
diff --git a/src/bower_components/emby-apiclient/sync/transfermanager.js b/src/bower_components/apiclient/sync/transfermanager.js
similarity index 100%
rename from src/bower_components/emby-apiclient/sync/transfermanager.js
rename to src/bower_components/apiclient/sync/transfermanager.js
diff --git a/src/bower_components/emby-apiclient/sync/useractionrepository.js b/src/bower_components/apiclient/sync/useractionrepository.js
similarity index 100%
rename from src/bower_components/emby-apiclient/sync/useractionrepository.js
rename to src/bower_components/apiclient/sync/useractionrepository.js