diff --git a/scripts/rename.py b/scripts/rename.py
new file mode 100644
index 000000000..9502c25ea
--- /dev/null
+++ b/scripts/rename.py
@@ -0,0 +1,8 @@
+import os
+import os.path
+
+for root, dirs, files in os.walk('.'):
+  for f in files:
+    fname = os.path.splitext(f)[0]
+    os.mkdir(fname)
+    os.rename(f, fname + '/index.ts')
diff --git a/src/plugins/plugin.ts b/src/core/plugin.ts
similarity index 100%
rename from src/plugins/plugin.ts
rename to src/core/plugin.ts
diff --git a/src/plugins/.d.py/.d.py.swp b/src/plugins/.d.py/.d.py.swp
new file mode 100644
index 000000000..23ffae08b
Binary files /dev/null and b/src/plugins/.d.py/.d.py.swp differ
diff --git a/src/plugins/3dtouch.ts b/src/plugins/3dtouch/index.ts
similarity index 100%
rename from src/plugins/3dtouch.ts
rename to src/plugins/3dtouch/index.ts
diff --git a/src/plugins/actionsheet.ts b/src/plugins/actionsheet/index.ts
similarity index 100%
rename from src/plugins/actionsheet.ts
rename to src/plugins/actionsheet/index.ts
diff --git a/src/plugins/admob.ts b/src/plugins/admob/index.ts
similarity index 100%
rename from src/plugins/admob.ts
rename to src/plugins/admob/index.ts
diff --git a/src/plugins/android-fingerprint-auth.ts b/src/plugins/android-fingerprint-auth/index.ts
similarity index 100%
rename from src/plugins/android-fingerprint-auth.ts
rename to src/plugins/android-fingerprint-auth/index.ts
diff --git a/src/plugins/appavailability.ts b/src/plugins/appavailability/index.ts
similarity index 100%
rename from src/plugins/appavailability.ts
rename to src/plugins/appavailability/index.ts
diff --git a/src/plugins/apprate.ts b/src/plugins/apprate/index.ts
similarity index 100%
rename from src/plugins/apprate.ts
rename to src/plugins/apprate/index.ts
diff --git a/src/plugins/appversion.ts b/src/plugins/appversion/index.ts
similarity index 100%
rename from src/plugins/appversion.ts
rename to src/plugins/appversion/index.ts
diff --git a/src/plugins/background-geolocation.ts b/src/plugins/background-geolocation/index.ts
similarity index 100%
rename from src/plugins/background-geolocation.ts
rename to src/plugins/background-geolocation/index.ts
diff --git a/src/plugins/backgroundmode.ts b/src/plugins/backgroundmode/index.ts
similarity index 100%
rename from src/plugins/backgroundmode.ts
rename to src/plugins/backgroundmode/index.ts
diff --git a/src/plugins/backlight.ts b/src/plugins/backlight/index.ts
similarity index 100%
rename from src/plugins/backlight.ts
rename to src/plugins/backlight/index.ts
diff --git a/src/plugins/badge.ts b/src/plugins/badge/index.ts
similarity index 100%
rename from src/plugins/badge.ts
rename to src/plugins/badge/index.ts
diff --git a/src/plugins/barcodescanner.ts b/src/plugins/barcodescanner/index.ts
similarity index 100%
rename from src/plugins/barcodescanner.ts
rename to src/plugins/barcodescanner/index.ts
diff --git a/src/plugins/base64togallery.ts b/src/plugins/base64togallery/index.ts
similarity index 100%
rename from src/plugins/base64togallery.ts
rename to src/plugins/base64togallery/index.ts
diff --git a/src/plugins/batterystatus.ts b/src/plugins/batterystatus/index.ts
similarity index 100%
rename from src/plugins/batterystatus.ts
rename to src/plugins/batterystatus/index.ts
diff --git a/src/plugins/ble.ts b/src/plugins/ble/index.ts
similarity index 100%
rename from src/plugins/ble.ts
rename to src/plugins/ble/index.ts
diff --git a/src/plugins/bluetoothserial.ts b/src/plugins/bluetoothserial/index.ts
similarity index 100%
rename from src/plugins/bluetoothserial.ts
rename to src/plugins/bluetoothserial/index.ts
diff --git a/src/plugins/brightness.ts b/src/plugins/brightness/index.ts
similarity index 100%
rename from src/plugins/brightness.ts
rename to src/plugins/brightness/index.ts
diff --git a/src/plugins/broadcaster.ts b/src/plugins/broadcaster/index.ts
similarity index 100%
rename from src/plugins/broadcaster.ts
rename to src/plugins/broadcaster/index.ts
diff --git a/src/plugins/calendar.ts b/src/plugins/calendar/index.ts
similarity index 100%
rename from src/plugins/calendar.ts
rename to src/plugins/calendar/index.ts
diff --git a/src/plugins/call-number.ts b/src/plugins/call-number/index.ts
similarity index 100%
rename from src/plugins/call-number.ts
rename to src/plugins/call-number/index.ts
diff --git a/src/plugins/camera-preview.ts b/src/plugins/camera-preview/index.ts
similarity index 100%
rename from src/plugins/camera-preview.ts
rename to src/plugins/camera-preview/index.ts
diff --git a/src/plugins/camera.ts b/src/plugins/camera/index.ts
similarity index 100%
rename from src/plugins/camera.ts
rename to src/plugins/camera/index.ts
diff --git a/src/plugins/card-io.ts b/src/plugins/card-io/index.ts
similarity index 100%
rename from src/plugins/card-io.ts
rename to src/plugins/card-io/index.ts
diff --git a/src/plugins/clipboard.ts b/src/plugins/clipboard/index.ts
similarity index 100%
rename from src/plugins/clipboard.ts
rename to src/plugins/clipboard/index.ts
diff --git a/src/plugins/code-push.ts b/src/plugins/code-push/index.ts
similarity index 100%
rename from src/plugins/code-push.ts
rename to src/plugins/code-push/index.ts
diff --git a/src/plugins/contacts.ts b/src/plugins/contacts/index.ts
similarity index 100%
rename from src/plugins/contacts.ts
rename to src/plugins/contacts/index.ts
diff --git a/src/plugins/crop.ts b/src/plugins/crop/index.ts
similarity index 100%
rename from src/plugins/crop.ts
rename to src/plugins/crop/index.ts
diff --git a/src/plugins/datepicker.ts b/src/plugins/datepicker/index.ts
similarity index 100%
rename from src/plugins/datepicker.ts
rename to src/plugins/datepicker/index.ts
diff --git a/src/plugins/dbmeter.ts b/src/plugins/dbmeter/index.ts
similarity index 100%
rename from src/plugins/dbmeter.ts
rename to src/plugins/dbmeter/index.ts
diff --git a/src/plugins/deeplinks.ts b/src/plugins/deeplinks/index.ts
similarity index 100%
rename from src/plugins/deeplinks.ts
rename to src/plugins/deeplinks/index.ts
diff --git a/src/plugins/device-feedback.ts b/src/plugins/device-feedback/index.ts
similarity index 100%
rename from src/plugins/device-feedback.ts
rename to src/plugins/device-feedback/index.ts
diff --git a/src/plugins/device.ts b/src/plugins/device/index.ts
similarity index 100%
rename from src/plugins/device.ts
rename to src/plugins/device/index.ts
diff --git a/src/plugins/deviceaccounts.ts b/src/plugins/deviceaccounts/index.ts
similarity index 100%
rename from src/plugins/deviceaccounts.ts
rename to src/plugins/deviceaccounts/index.ts
diff --git a/src/plugins/devicemotion.ts b/src/plugins/devicemotion/index.ts
similarity index 100%
rename from src/plugins/devicemotion.ts
rename to src/plugins/devicemotion/index.ts
diff --git a/src/plugins/deviceorientation.ts b/src/plugins/deviceorientation/index.ts
similarity index 100%
rename from src/plugins/deviceorientation.ts
rename to src/plugins/deviceorientation/index.ts
diff --git a/src/plugins/diagnostic.ts b/src/plugins/diagnostic/index.ts
similarity index 100%
rename from src/plugins/diagnostic.ts
rename to src/plugins/diagnostic/index.ts
diff --git a/src/plugins/dialogs.ts b/src/plugins/dialogs/index.ts
similarity index 100%
rename from src/plugins/dialogs.ts
rename to src/plugins/dialogs/index.ts
diff --git a/src/plugins/emailcomposer.ts b/src/plugins/emailcomposer/index.ts
similarity index 100%
rename from src/plugins/emailcomposer.ts
rename to src/plugins/emailcomposer/index.ts
diff --git a/src/plugins/estimote-beacons.ts b/src/plugins/estimote-beacons/index.ts
similarity index 100%
rename from src/plugins/estimote-beacons.ts
rename to src/plugins/estimote-beacons/index.ts
diff --git a/src/plugins/facebook.ts b/src/plugins/facebook/index.ts
similarity index 100%
rename from src/plugins/facebook.ts
rename to src/plugins/facebook/index.ts
diff --git a/src/plugins/file-chooser.ts b/src/plugins/file-chooser/index.ts
similarity index 100%
rename from src/plugins/file-chooser.ts
rename to src/plugins/file-chooser/index.ts
diff --git a/src/plugins/file-opener.ts b/src/plugins/file-opener/index.ts
similarity index 100%
rename from src/plugins/file-opener.ts
rename to src/plugins/file-opener/index.ts
diff --git a/src/plugins/file.ts b/src/plugins/file/index.ts
similarity index 100%
rename from src/plugins/file.ts
rename to src/plugins/file/index.ts
diff --git a/src/plugins/filepath.ts b/src/plugins/filepath/index.ts
similarity index 100%
rename from src/plugins/filepath.ts
rename to src/plugins/filepath/index.ts
diff --git a/src/plugins/filetransfer.ts b/src/plugins/filetransfer/index.ts
similarity index 100%
rename from src/plugins/filetransfer.ts
rename to src/plugins/filetransfer/index.ts
diff --git a/src/plugins/fingerprint-aio.ts b/src/plugins/fingerprint-aio/index.ts
similarity index 100%
rename from src/plugins/fingerprint-aio.ts
rename to src/plugins/fingerprint-aio/index.ts
diff --git a/src/plugins/firebase.ts b/src/plugins/firebase/index.ts
similarity index 100%
rename from src/plugins/firebase.ts
rename to src/plugins/firebase/index.ts
diff --git a/src/plugins/flashlight.ts b/src/plugins/flashlight/index.ts
similarity index 100%
rename from src/plugins/flashlight.ts
rename to src/plugins/flashlight/index.ts
diff --git a/src/plugins/geofence.ts b/src/plugins/geofence/index.ts
similarity index 100%
rename from src/plugins/geofence.ts
rename to src/plugins/geofence/index.ts
diff --git a/src/plugins/geolocation.ts b/src/plugins/geolocation/index.ts
similarity index 100%
rename from src/plugins/geolocation.ts
rename to src/plugins/geolocation/index.ts
diff --git a/src/plugins/globalization.ts b/src/plugins/globalization/index.ts
similarity index 100%
rename from src/plugins/globalization.ts
rename to src/plugins/globalization/index.ts
diff --git a/src/plugins/google-plus.ts b/src/plugins/google-plus/index.ts
similarity index 100%
rename from src/plugins/google-plus.ts
rename to src/plugins/google-plus/index.ts
diff --git a/src/plugins/googleanalytics.ts b/src/plugins/googleanalytics/index.ts
similarity index 100%
rename from src/plugins/googleanalytics.ts
rename to src/plugins/googleanalytics/index.ts
diff --git a/src/plugins/googlemap.ts b/src/plugins/googlemap/index.ts
similarity index 100%
rename from src/plugins/googlemap.ts
rename to src/plugins/googlemap/index.ts
diff --git a/src/plugins/headercolor.ts b/src/plugins/headercolor/index.ts
similarity index 100%
rename from src/plugins/headercolor.ts
rename to src/plugins/headercolor/index.ts
diff --git a/src/plugins/hotspot.ts b/src/plugins/hotspot/index.ts
similarity index 100%
rename from src/plugins/hotspot.ts
rename to src/plugins/hotspot/index.ts
diff --git a/src/plugins/http.ts b/src/plugins/http/index.ts
similarity index 100%
rename from src/plugins/http.ts
rename to src/plugins/http/index.ts
diff --git a/src/plugins/httpd.ts b/src/plugins/httpd/index.ts
similarity index 100%
rename from src/plugins/httpd.ts
rename to src/plugins/httpd/index.ts
diff --git a/src/plugins/ibeacon.ts b/src/plugins/ibeacon/index.ts
similarity index 100%
rename from src/plugins/ibeacon.ts
rename to src/plugins/ibeacon/index.ts
diff --git a/src/plugins/imagepicker.ts b/src/plugins/imagepicker/index.ts
similarity index 100%
rename from src/plugins/imagepicker.ts
rename to src/plugins/imagepicker/index.ts
diff --git a/src/plugins/imageresizer.ts b/src/plugins/imageresizer/index.ts
similarity index 100%
rename from src/plugins/imageresizer.ts
rename to src/plugins/imageresizer/index.ts
diff --git a/src/plugins/inappbrowser.ts b/src/plugins/inappbrowser/index.ts
similarity index 100%
rename from src/plugins/inappbrowser.ts
rename to src/plugins/inappbrowser/index.ts
diff --git a/src/plugins/inapppurchase.ts b/src/plugins/inapppurchase/index.ts
similarity index 100%
rename from src/plugins/inapppurchase.ts
rename to src/plugins/inapppurchase/index.ts
diff --git a/src/plugins/insomnia.ts b/src/plugins/insomnia/index.ts
similarity index 100%
rename from src/plugins/insomnia.ts
rename to src/plugins/insomnia/index.ts
diff --git a/src/plugins/instagram.ts b/src/plugins/instagram/index.ts
similarity index 100%
rename from src/plugins/instagram.ts
rename to src/plugins/instagram/index.ts
diff --git a/src/plugins/is-debug.ts b/src/plugins/is-debug/index.ts
similarity index 100%
rename from src/plugins/is-debug.ts
rename to src/plugins/is-debug/index.ts
diff --git a/src/plugins/keyboard.ts b/src/plugins/keyboard/index.ts
similarity index 100%
rename from src/plugins/keyboard.ts
rename to src/plugins/keyboard/index.ts
diff --git a/src/plugins/launch-review.ts b/src/plugins/launch-review/index.ts
similarity index 100%
rename from src/plugins/launch-review.ts
rename to src/plugins/launch-review/index.ts
diff --git a/src/plugins/launchnavigator.ts b/src/plugins/launchnavigator/index.ts
similarity index 100%
rename from src/plugins/launchnavigator.ts
rename to src/plugins/launchnavigator/index.ts
diff --git a/src/plugins/localnotifications.ts b/src/plugins/localnotifications/index.ts
similarity index 100%
rename from src/plugins/localnotifications.ts
rename to src/plugins/localnotifications/index.ts
diff --git a/src/plugins/location-accuracy.ts b/src/plugins/location-accuracy/index.ts
similarity index 100%
rename from src/plugins/location-accuracy.ts
rename to src/plugins/location-accuracy/index.ts
diff --git a/src/plugins/market.ts b/src/plugins/market/index.ts
similarity index 100%
rename from src/plugins/market.ts
rename to src/plugins/market/index.ts
diff --git a/src/plugins/media-capture.ts b/src/plugins/media-capture/index.ts
similarity index 100%
rename from src/plugins/media-capture.ts
rename to src/plugins/media-capture/index.ts
diff --git a/src/plugins/media.ts b/src/plugins/media/index.ts
similarity index 100%
rename from src/plugins/media.ts
rename to src/plugins/media/index.ts
diff --git a/src/plugins/mixpanel.ts b/src/plugins/mixpanel/index.ts
similarity index 100%
rename from src/plugins/mixpanel.ts
rename to src/plugins/mixpanel/index.ts
diff --git a/src/plugins/music-controls.ts b/src/plugins/music-controls/index.ts
similarity index 100%
rename from src/plugins/music-controls.ts
rename to src/plugins/music-controls/index.ts
diff --git a/src/plugins/native-audio.ts b/src/plugins/native-audio/index.ts
similarity index 100%
rename from src/plugins/native-audio.ts
rename to src/plugins/native-audio/index.ts
diff --git a/src/plugins/native-geocoder.ts b/src/plugins/native-geocoder/index.ts
similarity index 100%
rename from src/plugins/native-geocoder.ts
rename to src/plugins/native-geocoder/index.ts
diff --git a/src/plugins/native-page-transitions.ts b/src/plugins/native-page-transitions/index.ts
similarity index 100%
rename from src/plugins/native-page-transitions.ts
rename to src/plugins/native-page-transitions/index.ts
diff --git a/src/plugins/nativestorage.ts b/src/plugins/nativestorage/index.ts
similarity index 100%
rename from src/plugins/nativestorage.ts
rename to src/plugins/nativestorage/index.ts
diff --git a/src/plugins/navigationbar.ts b/src/plugins/navigationbar/index.ts
similarity index 100%
rename from src/plugins/navigationbar.ts
rename to src/plugins/navigationbar/index.ts
diff --git a/src/plugins/network.ts b/src/plugins/network/index.ts
similarity index 100%
rename from src/plugins/network.ts
rename to src/plugins/network/index.ts
diff --git a/src/plugins/nfc.ts b/src/plugins/nfc/index.ts
similarity index 100%
rename from src/plugins/nfc.ts
rename to src/plugins/nfc/index.ts
diff --git a/src/plugins/onesignal.ts b/src/plugins/onesignal/index.ts
similarity index 100%
rename from src/plugins/onesignal.ts
rename to src/plugins/onesignal/index.ts
diff --git a/src/plugins/pay-pal.ts b/src/plugins/pay-pal/index.ts
similarity index 100%
rename from src/plugins/pay-pal.ts
rename to src/plugins/pay-pal/index.ts
diff --git a/src/plugins/photo-viewer.ts b/src/plugins/photo-viewer/index.ts
similarity index 100%
rename from src/plugins/photo-viewer.ts
rename to src/plugins/photo-viewer/index.ts
diff --git a/src/plugins/pin-dialog.ts b/src/plugins/pin-dialog/index.ts
similarity index 100%
rename from src/plugins/pin-dialog.ts
rename to src/plugins/pin-dialog/index.ts
diff --git a/src/plugins/pinterest.ts b/src/plugins/pinterest/index.ts
similarity index 100%
rename from src/plugins/pinterest.ts
rename to src/plugins/pinterest/index.ts
diff --git a/src/plugins/power-management.ts b/src/plugins/power-management/index.ts
similarity index 100%
rename from src/plugins/power-management.ts
rename to src/plugins/power-management/index.ts
diff --git a/src/plugins/printer.ts b/src/plugins/printer/index.ts
similarity index 100%
rename from src/plugins/printer.ts
rename to src/plugins/printer/index.ts
diff --git a/src/plugins/push.ts b/src/plugins/push/index.ts
similarity index 100%
rename from src/plugins/push.ts
rename to src/plugins/push/index.ts
diff --git a/src/plugins/rollbar.ts b/src/plugins/rollbar/index.ts
similarity index 100%
rename from src/plugins/rollbar.ts
rename to src/plugins/rollbar/index.ts
diff --git a/src/plugins/safari-view-controller.ts b/src/plugins/safari-view-controller/index.ts
similarity index 100%
rename from src/plugins/safari-view-controller.ts
rename to src/plugins/safari-view-controller/index.ts
diff --git a/src/plugins/screen-orientation.ts b/src/plugins/screen-orientation/index.ts
similarity index 100%
rename from src/plugins/screen-orientation.ts
rename to src/plugins/screen-orientation/index.ts
diff --git a/src/plugins/screenshot.ts b/src/plugins/screenshot/index.ts
similarity index 100%
rename from src/plugins/screenshot.ts
rename to src/plugins/screenshot/index.ts
diff --git a/src/plugins/securestorage.ts b/src/plugins/securestorage/index.ts
similarity index 100%
rename from src/plugins/securestorage.ts
rename to src/plugins/securestorage/index.ts
diff --git a/src/plugins/serial.ts b/src/plugins/serial/index.ts
similarity index 100%
rename from src/plugins/serial.ts
rename to src/plugins/serial/index.ts
diff --git a/src/plugins/shake.ts b/src/plugins/shake/index.ts
similarity index 100%
rename from src/plugins/shake.ts
rename to src/plugins/shake/index.ts
diff --git a/src/plugins/sim.ts b/src/plugins/sim/index.ts
similarity index 100%
rename from src/plugins/sim.ts
rename to src/plugins/sim/index.ts
diff --git a/src/plugins/sms.ts b/src/plugins/sms/index.ts
similarity index 100%
rename from src/plugins/sms.ts
rename to src/plugins/sms/index.ts
diff --git a/src/plugins/socialsharing.ts b/src/plugins/socialsharing/index.ts
similarity index 100%
rename from src/plugins/socialsharing.ts
rename to src/plugins/socialsharing/index.ts
diff --git a/src/plugins/speech-recognition.ts b/src/plugins/speech-recognition/index.ts
similarity index 100%
rename from src/plugins/speech-recognition.ts
rename to src/plugins/speech-recognition/index.ts
diff --git a/src/plugins/spinnerdialog.ts b/src/plugins/spinnerdialog/index.ts
similarity index 100%
rename from src/plugins/spinnerdialog.ts
rename to src/plugins/spinnerdialog/index.ts
diff --git a/src/plugins/splashscreen.ts b/src/plugins/splashscreen/index.ts
similarity index 100%
rename from src/plugins/splashscreen.ts
rename to src/plugins/splashscreen/index.ts
diff --git a/src/plugins/sqlite.ts b/src/plugins/sqlite/index.ts
similarity index 100%
rename from src/plugins/sqlite.ts
rename to src/plugins/sqlite/index.ts
diff --git a/src/plugins/statusbar.ts b/src/plugins/statusbar/index.ts
similarity index 100%
rename from src/plugins/statusbar.ts
rename to src/plugins/statusbar/index.ts
diff --git a/src/plugins/stepcounter.ts b/src/plugins/stepcounter/index.ts
similarity index 100%
rename from src/plugins/stepcounter.ts
rename to src/plugins/stepcounter/index.ts
diff --git a/src/plugins/streaming-media.ts b/src/plugins/streaming-media/index.ts
similarity index 100%
rename from src/plugins/streaming-media.ts
rename to src/plugins/streaming-media/index.ts
diff --git a/src/plugins/stripe.ts b/src/plugins/stripe/index.ts
similarity index 100%
rename from src/plugins/stripe.ts
rename to src/plugins/stripe/index.ts
diff --git a/src/plugins/text-to-speech.ts b/src/plugins/text-to-speech/index.ts
similarity index 100%
rename from src/plugins/text-to-speech.ts
rename to src/plugins/text-to-speech/index.ts
diff --git a/src/plugins/themeable-browser.ts b/src/plugins/themeable-browser/index.ts
similarity index 100%
rename from src/plugins/themeable-browser.ts
rename to src/plugins/themeable-browser/index.ts
diff --git a/src/plugins/toast.ts b/src/plugins/toast/index.ts
similarity index 100%
rename from src/plugins/toast.ts
rename to src/plugins/toast/index.ts
diff --git a/src/plugins/touchid.ts b/src/plugins/touchid/index.ts
similarity index 100%
rename from src/plugins/touchid.ts
rename to src/plugins/touchid/index.ts
diff --git a/src/plugins/twitter-connect.ts b/src/plugins/twitter-connect/index.ts
similarity index 100%
rename from src/plugins/twitter-connect.ts
rename to src/plugins/twitter-connect/index.ts
diff --git a/src/plugins/vibration.ts b/src/plugins/vibration/index.ts
similarity index 100%
rename from src/plugins/vibration.ts
rename to src/plugins/vibration/index.ts
diff --git a/src/plugins/video-editor.ts b/src/plugins/video-editor/index.ts
similarity index 100%
rename from src/plugins/video-editor.ts
rename to src/plugins/video-editor/index.ts
diff --git a/src/plugins/video-player.ts b/src/plugins/video-player/index.ts
similarity index 100%
rename from src/plugins/video-player.ts
rename to src/plugins/video-player/index.ts
diff --git a/src/plugins/webintent.ts b/src/plugins/webintent/index.ts
similarity index 100%
rename from src/plugins/webintent.ts
rename to src/plugins/webintent/index.ts
diff --git a/src/plugins/youtube-video-player.ts b/src/plugins/youtube-video-player/index.ts
similarity index 100%
rename from src/plugins/youtube-video-player.ts
rename to src/plugins/youtube-video-player/index.ts
diff --git a/src/plugins/z-bar.ts b/src/plugins/z-bar/index.ts
similarity index 100%
rename from src/plugins/z-bar.ts
rename to src/plugins/z-bar/index.ts
diff --git a/src/plugins/zip.ts b/src/plugins/zip/index.ts
similarity index 100%
rename from src/plugins/zip.ts
rename to src/plugins/zip/index.ts