Fixing merge fix
Removing cordova js
renamed and fixed