diff --git a/clipboard.js/clipboard.js-tests.ts b/clipboard.js/clipboard.js-tests.ts
deleted file mode 100644
index 962bf34e0..000000000
--- a/clipboard.js/clipboard.js-tests.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/// <reference path="clipboard.js.d.ts" />
-
-var cb1 = new clipboardjs.Clipboard('.btn');
-var cb2 = new clipboardjs.Clipboard('.btn', {
-    action: elem => 'copy'
-});
-var cb3 = new clipboardjs.Clipboard('.btn', {
-    text: elem => null
-});
-var cb4 = new clipboardjs.Clipboard('.btn', {
-    target: elem => null
-});
-var cb5 = new clipboardjs.Clipboard('.btn', {
-    action: elem => 'copy',
-    target: elem => null
-});
-
-cb1.destroy();
-
-cb2.on('success', function(e) { });
-cb2.on('error', function(e) { });
-
diff --git a/clipboard/clipboard-tests.ts b/clipboard/clipboard-tests.ts
new file mode 100644
index 000000000..de6e9fc1a
--- /dev/null
+++ b/clipboard/clipboard-tests.ts
@@ -0,0 +1,22 @@
+/// <reference path="clipboard.d.ts" />
+
+var cb1 = new clipboard.Clipboard('.btn');
+var cb2 = new clipboard.Clipboard('.btn', {
+    action: elem => 'copy'
+});
+var cb3 = new clipboard.Clipboard('.btn', {
+    text: elem => null
+});
+var cb4 = new clipboard.Clipboard('.btn', {
+    target: elem => null
+});
+var cb5 = new clipboard.Clipboard('.btn', {
+    action: elem => 'copy',
+    target: elem => null
+});
+
+cb1.destroy();
+
+cb2.on('success', function(e) { });
+cb2.on('error', function(e) { });
+
diff --git a/clipboard.js/clipboard.js.d.ts b/clipboard/clipboard.d.ts
similarity index 94%
rename from clipboard.js/clipboard.js.d.ts
rename to clipboard/clipboard.d.ts
index 6a8af8519..ddba32b06 100644
--- a/clipboard.js/clipboard.js.d.ts
+++ b/clipboard/clipboard.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Andrei Kurosh <https://github.com/impworks>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-declare module clipboardjs {
+declare module clipboard {
 
     export class Clipboard {
         constructor(selector: string, options?: IOptions);
@@ -47,6 +47,6 @@ declare module clipboardjs {
     }
 }
 
-declare module 'clipboardjs' {
-    export = clipboardjs;
+declare module 'clipboard' {
+    export = clipboard;
 }
\ No newline at end of file