diff --git a/cordova/plugins/BatteryStatus.d.ts b/cordova-plugin-battery-status/index.d.ts
similarity index 100%
rename from cordova/plugins/BatteryStatus.d.ts
rename to cordova-plugin-battery-status/index.d.ts
diff --git a/cordova/plugins/Camera.d.ts b/cordova-plugin-camera/index.d.ts
similarity index 100%
rename from cordova/plugins/Camera.d.ts
rename to cordova-plugin-camera/index.d.ts
diff --git a/cordova/plugins/Contacts.d.ts b/cordova-plugin-contacts/index.d.ts
similarity index 100%
rename from cordova/plugins/Contacts.d.ts
rename to cordova-plugin-contacts/index.d.ts
diff --git a/cordova/plugins/DeviceMotion.d.ts b/cordova-plugin-device-motion/index.d.ts
similarity index 100%
rename from cordova/plugins/DeviceMotion.d.ts
rename to cordova-plugin-device-motion/index.d.ts
diff --git a/cordova/plugins/DeviceOrientation.d.ts b/cordova-plugin-device-orientation/index.d.ts
similarity index 100%
rename from cordova/plugins/DeviceOrientation.d.ts
rename to cordova-plugin-device-orientation/index.d.ts
diff --git a/cordova/plugins/Device.d.ts b/cordova-plugin-device/index.d.ts
similarity index 100%
rename from cordova/plugins/Device.d.ts
rename to cordova-plugin-device/index.d.ts
diff --git a/cordova/plugins/Dialogs.d.ts b/cordova-plugin-dialogs/index.d.ts
similarity index 100%
rename from cordova/plugins/Dialogs.d.ts
rename to cordova-plugin-dialogs/index.d.ts
diff --git a/cordova/plugins/FileTransfer.d.ts b/cordova-plugin-file-transfer/index.d.ts
similarity index 99%
rename from cordova/plugins/FileTransfer.d.ts
rename to cordova-plugin-file-transfer/index.d.ts
index 40829668aa..8dad62a1e9 100644
--- a/cordova/plugins/FileTransfer.d.ts
+++ b/cordova-plugin-file-transfer/index.d.ts
@@ -6,7 +6,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc.
 // Licensed under the MIT license.
 
-/// <reference path="FileSystem.d.ts"/>
+/// <reference types="cordova-plugin-file" />
 
 /**
  * The FileTransfer object provides a way to upload files using an HTTP multi-part POST request,
diff --git a/cordova/plugins/FileSystem.d.ts b/cordova-plugin-file/index.d.ts
similarity index 100%
rename from cordova/plugins/FileSystem.d.ts
rename to cordova-plugin-file/index.d.ts
diff --git a/cordova/plugins/Globalization.d.ts b/cordova-plugin-globalization/index.d.ts
similarity index 100%
rename from cordova/plugins/Globalization.d.ts
rename to cordova-plugin-globalization/index.d.ts
diff --git a/cordova/plugins/InAppBrowser.d.ts b/cordova-plugin-inappbrowser/index.d.ts
similarity index 100%
rename from cordova/plugins/InAppBrowser.d.ts
rename to cordova-plugin-inappbrowser/index.d.ts
diff --git a/cordova/plugins/Keyboard.d.ts b/cordova-plugin-keyboard/index.d.ts
similarity index 100%
rename from cordova/plugins/Keyboard.d.ts
rename to cordova-plugin-keyboard/index.d.ts
diff --git a/cordova/plugins/MediaCapture.d.ts b/cordova-plugin-media-capture/index.d.ts
similarity index 100%
rename from cordova/plugins/MediaCapture.d.ts
rename to cordova-plugin-media-capture/index.d.ts
diff --git a/cordova/plugins/Media.d.ts b/cordova-plugin-media/index.d.ts
similarity index 100%
rename from cordova/plugins/Media.d.ts
rename to cordova-plugin-media/index.d.ts
diff --git a/cordova/plugins/NetworkInformation.d.ts b/cordova-plugin-network-information/index.d.ts
similarity index 100%
rename from cordova/plugins/NetworkInformation.d.ts
rename to cordova-plugin-network-information/index.d.ts
diff --git a/cordova/plugins/Splashscreen.d.ts b/cordova-plugin-spashscreen/index.d.ts
similarity index 100%
rename from cordova/plugins/Splashscreen.d.ts
rename to cordova-plugin-spashscreen/index.d.ts
diff --git a/cordova/plugins/StatusBar-tests.ts b/cordova-plugin-statusbar/StatusBar-tests.ts
similarity index 100%
rename from cordova/plugins/StatusBar-tests.ts
rename to cordova-plugin-statusbar/StatusBar-tests.ts
diff --git a/cordova/plugins/StatusBar.d.ts b/cordova-plugin-statusbar/index.d.ts
similarity index 100%
rename from cordova/plugins/StatusBar.d.ts
rename to cordova-plugin-statusbar/index.d.ts
diff --git a/cordova/plugins/Vibration.d.ts b/cordova-plugin-vibration/index.d.ts
similarity index 100%
rename from cordova/plugins/Vibration.d.ts
rename to cordova-plugin-vibration/index.d.ts
diff --git a/cordova/plugins/WebSQL.d.ts b/cordova-plugin-websql/index.d.ts
similarity index 100%
rename from cordova/plugins/WebSQL.d.ts
rename to cordova-plugin-websql/index.d.ts
diff --git a/cordova/plugins/Push.d.ts b/cordova/plugins/Push.d.ts
deleted file mode 100644
index 631cb7f008..0000000000
--- a/cordova/plugins/Push.d.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-// Type definitions for Apache Cordova Push plugin.
-// Project: https://github.com/phonegap-build/PushPlugin
-// Definitions by: Microsoft Open Technologies, Inc. <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 
-// Copyright (c) Microsoft Open Technologies, Inc.
-// Licensed under the MIT license.
-
-interface Window {
-    plugins: Plugins
-}
-
-interface Plugins {
-    /**
-     * This plugin allows to receive push notifications. The Android implementation uses
-     * Google's GCM (Google Cloud Messaging) service,
-     * whereas the iOS version is based on Apple APNS Notifications
-     */
-    pushNotification: PushNotification
-}
-
-/**
- * This plugin allows to receive push notifications. The Android implementation uses
- * Google's GCM (Google Cloud Messaging) service,
- * whereas the iOS version is based on Apple APNS Notifications
- */
-interface PushNotification {
-    /**
-     * Registers as push notification receiver.
-     * @param successCallback     Called when a plugin method returns without error.
-     * @param errorCallback       Called when the plugin returns an error.
-     * @param registrationOptions Options for registration process.
-     */
-    register(
-        successCallback: (registrationId: string) => void,
-        errorCallback: (error: any) => void,
-        registrationOptions: RegistrationOptions): void;
-    /**
-     * Unregisters as push notification receiver.
-     * @param successCallback     Called when a plugin method returns without error.
-     * @param errorCallback       Called when the plugin returns an error.
-     */
-    unregister(
-        successCallback: (result: any) => void,
-        errorCallback: (error: any) => void): void;
-    /**
-     * Sets the badge count visible when the app is not running. iOS only.
-     * @param successCallback Called when a plugin method returns without error.
-     * @param errorCallback   Called when the plugin returns an error.
-     * @param badgeCount      An integer indicating what number should show up in the badge. Passing 0 will clear the badge.
-     */
-    setApplicationIconBadgeNumber(
-        successCallback: (result: any) => void,
-        errorCallback: (error: any) => void,
-        badgeCount: number): void;
-}
-
-/** Options for registration process. */
-interface RegistrationOptions {
-    /** This is the Google project ID you need to obtain by registering your application for GCM. Android only */
-    senderID?: string;
-    /** WP8 only */
-    channelName?: string;
-    /** Callback, that is fired when notification arrived */
-    ecb?: string;
-    badge?: boolean;
-    sound?: boolean;
-    alert?: boolean
-}
-