diff --git a/types/convert-layout/by.d.ts b/types/convert-layout/by.d.ts
deleted file mode 100644
index bc4d5ac834..0000000000
--- a/types/convert-layout/by.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { layout } from './index';
-export const by: layout;
diff --git a/types/convert-layout/convert-layout-tests.ts b/types/convert-layout/convert-layout-tests.ts
index 041e257531..8a55a1bfb5 100644
--- a/types/convert-layout/convert-layout-tests.ts
+++ b/types/convert-layout/convert-layout-tests.ts
@@ -1,4 +1,4 @@
-import { ru } from 'convert-layout/ru';
+import { ru } from 'convert-layout';
 
 const s = 'Lorem ipsum dolor sit amet.';
 let result = ru.toEn(s);
diff --git a/types/convert-layout/de.d.ts b/types/convert-layout/de.d.ts
deleted file mode 100644
index d422224a3f..0000000000
--- a/types/convert-layout/de.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { layout } from './index';
-export const de: layout;
diff --git a/types/convert-layout/es.d.ts b/types/convert-layout/es.d.ts
deleted file mode 100644
index 3c4a7b75dd..0000000000
--- a/types/convert-layout/es.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { layout } from './index';
-export const es: layout;
diff --git a/types/convert-layout/he.d.ts b/types/convert-layout/he.d.ts
deleted file mode 100644
index ca98b2d035..0000000000
--- a/types/convert-layout/he.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { layout } from './index';
-export const he: layout;
diff --git a/types/convert-layout/index.d.ts b/types/convert-layout/index.d.ts
index 65475cf107..b19370efd2 100644
--- a/types/convert-layout/index.d.ts
+++ b/types/convert-layout/index.d.ts
@@ -3,9 +3,52 @@
 // Definitions by: Mikhail Aksenov <https://github.com/xeningem>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
-export const layouts: { [id: string]: layout };
+declare var layouts: { [id: string]: layout };
+declare var lang_layout: layout;
 
-export interface layout {
+declare const convert_layout: {
+    by: layout;
+    de: layout;
+    es: layout;
+    he: layout;
+    kk: layout;
+    ru: layout;
+    uk: layout;
+};
+
+declare module "convert-layout" {
+    export = convert_layout;
+}
+
+declare module "convert-layout/by" {
+    export = lang_layout;
+}
+
+declare module "convert-layout/de" {
+    export = lang_layout;
+}
+
+declare module "convert-layout/es" {
+    export = lang_layout;
+}
+
+declare module "convert-layout/he" {
+    export = lang_layout;
+}
+
+declare module "convert-layout/kk" {
+    export = lang_layout;
+}
+
+declare module "convert-layout/ru" {
+    export = lang_layout;
+}
+
+declare module "convert-layout/uk" {
+    export = lang_layout;
+}
+
+interface layout {
     toEn(s: string): string;
     fromEn(s: string): string;
 }
diff --git a/types/convert-layout/kk.d.ts b/types/convert-layout/kk.d.ts
deleted file mode 100644
index a9cc93f774..0000000000
--- a/types/convert-layout/kk.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { layout } from './index';
-export const kk: layout;
diff --git a/types/convert-layout/ru.d.ts b/types/convert-layout/ru.d.ts
deleted file mode 100644
index 3cd24807cb..0000000000
--- a/types/convert-layout/ru.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { layout } from './index';
-export const ru: layout;
diff --git a/types/convert-layout/tsconfig.json b/types/convert-layout/tsconfig.json
index 6e40f2f030..e9ef959215 100644
--- a/types/convert-layout/tsconfig.json
+++ b/types/convert-layout/tsconfig.json
@@ -18,13 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "by.d.ts",
-        "de.d.ts",
-        "es.d.ts",
-        "he.d.ts",
-        "kk.d.ts",
-        "ru.d.ts",
-        "uk.d.ts",
         "convert-layout-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/convert-layout/tslint.json b/types/convert-layout/tslint.json
index 3db14f85ea..5ef9aa96e5 100644
--- a/types/convert-layout/tslint.json
+++ b/types/convert-layout/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{ 
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-declare-current-package": false 
+    }
+}
diff --git a/types/convert-layout/uk.d.ts b/types/convert-layout/uk.d.ts
deleted file mode 100644
index dee51e6f00..0000000000
--- a/types/convert-layout/uk.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { layout } from './index';
-export const uk: layout;