diff --git a/format-unicorn/format-unicorn-safe-tests.ts b/format-unicorn/format-unicorn-safe-tests.ts
index e83f2023f5..12e325fc36 100644
--- a/format-unicorn/format-unicorn-safe-tests.ts
+++ b/format-unicorn/format-unicorn-safe-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="format-unicorn-safe.d.ts"/>
-
 import formatUnicorn = require('format-unicorn/safe');
 
 // Safe version
diff --git a/format-unicorn/format-unicorn-safe.d.ts b/format-unicorn/format-unicorn-safe.d.ts
deleted file mode 100644
index 80dc6a4544..0000000000
--- a/format-unicorn/format-unicorn-safe.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for format-unicorn
-// Project: https://github.com/tallesl/format-unicorn
-// Definitions by: kruncher <https://github.com/kruncher/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'format-unicorn/safe' {
-
-  function formatUnicornSafe(str: string, replacements: { }): string;
-
-  export = formatUnicornSafe;
-
-}
diff --git a/format-unicorn/index.d.ts b/format-unicorn/index.d.ts
index 8495de9222..0890597b96 100644
--- a/format-unicorn/index.d.ts
+++ b/format-unicorn/index.d.ts
@@ -1,12 +1,8 @@
-// Type definitions for format-unicorn
+// Type definitions for format-unicorn 1.1
 // Project: https://github.com/tallesl/format-unicorn
 // Definitions by: kruncher <https://github.com/kruncher/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface String {
-  formatUnicorn(replacements: { }): string;
-}
-
-declare module "format-unicorn" {
-
+  formatUnicorn(replacements: {}): string;
 }
diff --git a/format-unicorn/safe.d.ts b/format-unicorn/safe.d.ts
new file mode 100644
index 0000000000..8835afab5f
--- /dev/null
+++ b/format-unicorn/safe.d.ts
@@ -0,0 +1,2 @@
+declare function formatUnicornSafe(str: string, replacements: { }): string;
+export = formatUnicornSafe;
diff --git a/format-unicorn/tsconfig.json b/format-unicorn/tsconfig.json
index 265f92ffe4..2c82afbd5b 100644
--- a/format-unicorn/tsconfig.json
+++ b/format-unicorn/tsconfig.json
@@ -15,6 +15,8 @@
     },
     "files": [
         "index.d.ts",
-        "format-unicorn-tests.ts"
+        "safe.d.ts",
+        "format-unicorn-tests.ts",
+        "format-unicorn-safe-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/format-unicorn/tslint.json b/format-unicorn/tslint.json
new file mode 100644
index 0000000000..2221e40e4a
--- /dev/null
+++ b/format-unicorn/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
\ No newline at end of file