diff --git a/src/docx/file.ts b/src/docx/file.ts
index 2b11926fdb..4580121479 100644
--- a/src/docx/file.ts
+++ b/src/docx/file.ts
@@ -1,10 +1,11 @@
 import { Media } from "../media";
-import { Numbering } from "../numbering";
 import { IPropertiesOptions, Properties } from "../properties";
 import { Styles } from "../styles";
 import { DefaultStylesFactory } from "../styles/factory";
 import { Document } from "./document";
-import { Paragraph, Table } from "./index";
+import { Numbering } from "./numbering";
+import { Paragraph } from "./paragraph";
+import { Table } from "./table";
 
 export class File {
 
diff --git a/src/docx/index.ts b/src/docx/index.ts
index f9ebf81f68..2e44ea7113 100644
--- a/src/docx/index.ts
+++ b/src/docx/index.ts
@@ -2,3 +2,4 @@ export * from "./document";
 export * from "./paragraph";
 export * from "./table";
 export * from "./file";
+export * from "./numbering";
diff --git a/src/numbering/abstract-numbering.ts b/src/docx/numbering/abstract-numbering.ts
similarity index 93%
rename from src/numbering/abstract-numbering.ts
rename to src/docx/numbering/abstract-numbering.ts
index 3491ec6426..2565444eef 100644
--- a/src/numbering/abstract-numbering.ts
+++ b/src/docx/numbering/abstract-numbering.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../docx/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "../xml-components";
 import { Level } from "./level";
 import { MultiLevelType } from "./multi-level-type";
 
diff --git a/src/numbering/index.ts b/src/docx/numbering/index.ts
similarity index 100%
rename from src/numbering/index.ts
rename to src/docx/numbering/index.ts
diff --git a/src/numbering/level.ts b/src/docx/numbering/level.ts
similarity index 95%
rename from src/numbering/level.ts
rename to src/docx/numbering/level.ts
index 856b49c9e3..3130fad96f 100644
--- a/src/numbering/level.ts
+++ b/src/docx/numbering/level.ts
@@ -1,8 +1,8 @@
-import * as paragraph from "../docx/paragraph/formatting";
-import { ParagraphProperties } from "../docx/paragraph/properties";
-import * as formatting from "../docx/paragraph/run/formatting";
-import { RunProperties } from "../docx/paragraph/run/properties";
-import { Attributes, XmlAttributeComponent, XmlComponent } from "../docx/xml-components";
+import * as paragraph from "../paragraph/formatting";
+import { ParagraphProperties } from "../paragraph/properties";
+import * as formatting from "../paragraph/run/formatting";
+import { RunProperties } from "../paragraph/run/properties";
+import { Attributes, XmlAttributeComponent, XmlComponent } from "../xml-components";
 
 interface ILevelAttributesProperties {
     ilvl?: number;
diff --git a/src/numbering/multi-level-type.ts b/src/docx/numbering/multi-level-type.ts
similarity index 75%
rename from src/numbering/multi-level-type.ts
rename to src/docx/numbering/multi-level-type.ts
index 9822b18c1a..d17e1a19b0 100644
--- a/src/numbering/multi-level-type.ts
+++ b/src/docx/numbering/multi-level-type.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../docx/xml-components";
+import { Attributes, XmlComponent } from "../xml-components";
 
 export class MultiLevelType extends XmlComponent {
 
diff --git a/src/numbering/num.ts b/src/docx/numbering/num.ts
similarity index 98%
rename from src/numbering/num.ts
rename to src/docx/numbering/num.ts
index 5e73441f8d..0f9bd7e5f8 100644
--- a/src/numbering/num.ts
+++ b/src/docx/numbering/num.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlAttributeComponent, XmlComponent } from "../docx/xml-components";
+import { Attributes, XmlAttributeComponent, XmlComponent } from "../xml-components";
 import { LevelForOverride } from "./level";
 
 class AbstractNumId extends XmlComponent {
diff --git a/src/numbering/numbering.spec.ts b/src/docx/numbering/numbering.spec.ts
similarity index 99%
rename from src/numbering/numbering.spec.ts
rename to src/docx/numbering/numbering.spec.ts
index 58483841af..a61d352c33 100644
--- a/src/numbering/numbering.spec.ts
+++ b/src/docx/numbering/numbering.spec.ts
@@ -1,5 +1,5 @@
 import { expect } from "chai";
-import { Formatter } from "../export/formatter";
+import { Formatter } from "../../export/formatter";
 import { Numbering } from "./";
 import { AbstractNumbering } from "./abstract-numbering";
 import { LevelForOverride } from "./level";
diff --git a/src/numbering/numbering.ts b/src/docx/numbering/numbering.ts
similarity index 94%
rename from src/numbering/numbering.ts
rename to src/docx/numbering/numbering.ts
index 4fbde9aa8a..e2f146771f 100644
--- a/src/numbering/numbering.ts
+++ b/src/docx/numbering/numbering.ts
@@ -1,7 +1,7 @@
-import { DocumentAttributes } from "../docx/document/document-attributes";
-import { Indent } from "../docx/paragraph/formatting";
-import { RunFonts } from "../docx/paragraph/run/run-fonts";
-import { XmlComponent } from "../docx/xml-components";
+import { DocumentAttributes } from "../document/document-attributes";
+import { Indent } from "../paragraph/formatting";
+import { RunFonts } from "../paragraph/run/run-fonts";
+import { XmlComponent } from "../xml-components";
 import { AbstractNumbering } from "./abstract-numbering";
 import { Num } from "./num";
 
diff --git a/src/docx/paragraph/paragraph.spec.ts b/src/docx/paragraph/paragraph.spec.ts
index bc239fc298..0a629de668 100644
--- a/src/docx/paragraph/paragraph.spec.ts
+++ b/src/docx/paragraph/paragraph.spec.ts
@@ -2,7 +2,7 @@ import { assert, expect } from "chai";
 
 import * as docx from "../../docx";
 import { Formatter } from "../../export/formatter";
-import { Numbering } from "../../numbering";
+import { Numbering } from "../numbering";
 
 describe("Paragraph", () => {
     let paragraph: docx.Paragraph;
diff --git a/src/docx/paragraph/paragraph.ts b/src/docx/paragraph/paragraph.ts
index 71661e346f..8c2ba415a1 100644
--- a/src/docx/paragraph/paragraph.ts
+++ b/src/docx/paragraph/paragraph.ts
@@ -1,6 +1,6 @@
 // http://officeopenxml.com/WPparagraph.php
 import { IData } from "../../media/data";
-import { Num } from "../../numbering/num";
+import { Num } from "../numbering/num";
 import { XmlComponent } from "../xml-components";
 import { PictureRun, Run, TextRun } from "./run";
 
diff --git a/src/index.ts b/src/index.ts
index 7c5a2fda81..34c4233792 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,6 +1,5 @@
 export * from "./docx";
 export * from "./export";
-export { Numbering } from "./numbering";
 export { Styles } from "./styles";
 export { Media } from "./media";
 export * from "./export";