diff --git a/src/docx/run/run-components/drawing/drawing.spec.ts b/src/docx/drawing/drawing.spec.ts
similarity index 93%
rename from src/docx/run/run-components/drawing/drawing.spec.ts
rename to src/docx/drawing/drawing.spec.ts
index aa55535059..8bda6243e7 100644
--- a/src/docx/run/run-components/drawing/drawing.spec.ts
+++ b/src/docx/drawing/drawing.spec.ts
@@ -1,7 +1,7 @@
 import { assert } from "chai";
 import * as fs from "fs";
 
-import { Utility } from "../../../../tests/utility";
+import { Utility } from "../../tests/utility";
 import { Drawing } from "./";
 
 describe("Drawing", () => {
diff --git a/src/docx/run/run-components/drawing/index.ts b/src/docx/drawing/index.ts
similarity index 75%
rename from src/docx/run/run-components/drawing/index.ts
rename to src/docx/drawing/index.ts
index fab434e058..8278cab933 100644
--- a/src/docx/run/run-components/drawing/index.ts
+++ b/src/docx/drawing/index.ts
@@ -1,5 +1,5 @@
-import { IData } from "../../../../media/data";
-import { XmlComponent } from "../../../xml-components";
+import { XmlComponent } from "../../docx/xml-components";
+import { IData } from "../../media/data";
 import { Inline } from "./inline";
 
 export class Drawing extends XmlComponent {
diff --git a/src/docx/run/run-components/drawing/inline/graphic/graphic-data/index.ts b/src/docx/drawing/inline/graphic/graphic-data/index.ts
similarity index 75%
rename from src/docx/run/run-components/drawing/inline/graphic/graphic-data/index.ts
rename to src/docx/drawing/inline/graphic/graphic-data/index.ts
index c717a1098c..c1d427a4c9 100644
--- a/src/docx/run/run-components/drawing/inline/graphic/graphic-data/index.ts
+++ b/src/docx/drawing/inline/graphic/graphic-data/index.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../../../xml-components";
+import { XmlComponent } from "../../../../xml-components";
 import { Pic } from "./pic";
 
 export class GraphicData extends XmlComponent {
diff --git a/src/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts b/src/docx/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts
similarity index 84%
rename from src/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts
rename to src/docx/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts
index ac2ca1d580..a97e007ee3 100644
--- a/src/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts
+++ b/src/docx/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../../../../../xml-components";
+import { XmlComponent } from "../../../../../../xml-components";
 import { Blip } from "./blip";
 import { SourceRectangle } from "./source-rectangle";
 import { Stretch } from "./stretch";
diff --git a/src/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/blip/blip.ts b/src/docx/drawing/inline/graphic/graphic-data/pic/blip/blip.ts
similarity index 93%
rename from src/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/blip/blip.ts
rename to src/docx/drawing/inline/graphic/graphic-data/pic/blip/blip.ts
index 2926c52893..2a8f1a04cb 100644
--- a/src/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/blip/blip.ts
+++ b/src/docx/drawing/inline/graphic/graphic-data/pic/blip/blip.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../../../../../../../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "../../../../../../xml-components";
 
 interface IBlipProperties {
     embed: string;
diff --git a/src/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts b/src/docx/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts
similarity index 60%
rename from src/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts
rename to src/docx/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts
index 32df3eaaac..ff8429c110 100644
--- a/src/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts
+++ b/src/docx/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../../../../../xml-components";
+import { XmlComponent } from "../../../../../../xml-components";
 
 export class SourceRectangle extends XmlComponent {
 
diff --git a/src/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts b/src/docx/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts
similarity index 77%
rename from src/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts
rename to src/docx/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts
index c42fa04ff3..b2a612f25e 100644
--- a/src/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts
+++ b/src/docx/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../../../../../xml-components";
+import { XmlComponent } from "../../../../../../xml-components";
 
 class FillRectangle extends XmlComponent {
 
diff --git a/src/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/index.ts b/src/docx/drawing/inline/graphic/graphic-data/pic/index.ts
similarity index 75%
rename from src/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/index.ts
rename to src/docx/drawing/inline/graphic/graphic-data/pic/index.ts
index 54628facf8..a4598fb4af 100644
--- a/src/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/index.ts
+++ b/src/docx/drawing/inline/graphic/graphic-data/pic/index.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../../../../xml-components";
+import { XmlComponent } from "../../../../../xml-components";
 import { BlipFill } from "./blip/blip-fill";
 
 export class Pic extends XmlComponent {
diff --git a/src/docx/run/run-components/drawing/inline/graphic/index.ts b/src/docx/drawing/inline/graphic/index.ts
similarity index 96%
rename from src/docx/run/run-components/drawing/inline/graphic/index.ts
rename to src/docx/drawing/inline/graphic/index.ts
index 0ee4f17a88..a057950ea3 100644
--- a/src/docx/run/run-components/drawing/inline/graphic/index.ts
+++ b/src/docx/drawing/inline/graphic/index.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../../../../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "../../../../docx/xml-components";
 import { GraphicData } from "./graphic-data";
 
 interface IGraphicProperties {
diff --git a/src/docx/run/run-components/drawing/inline/index.ts b/src/docx/drawing/inline/index.ts
similarity index 77%
rename from src/docx/run/run-components/drawing/inline/index.ts
rename to src/docx/drawing/inline/index.ts
index 8f752edfcc..81bd51755d 100644
--- a/src/docx/run/run-components/drawing/inline/index.ts
+++ b/src/docx/drawing/inline/index.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../xml-components";
+import { XmlComponent } from "../../../docx/xml-components";
 import { Graphic } from "./graphic";
 
 export class Inline extends XmlComponent {
diff --git a/src/docx/index.ts b/src/docx/index.ts
index c11178fda4..f9ebf81f68 100644
--- a/src/docx/index.ts
+++ b/src/docx/index.ts
@@ -1,5 +1,4 @@
 export * from "./document";
 export * from "./paragraph";
-export * from "./run";
-export { Table } from "./table";
-export { File } from "./file";
+export * from "./table";
+export * from "./file";
diff --git a/src/docx/paragraph/formatting/page-break.ts b/src/docx/paragraph/formatting/page-break.ts
index 055b0a106c..13c5e68e2b 100644
--- a/src/docx/paragraph/formatting/page-break.ts
+++ b/src/docx/paragraph/formatting/page-break.ts
@@ -1,6 +1,6 @@
 // http://officeopenxml.com/WPtextSpecialContent-break.php
-import { Run } from "../../run";
 import { Attributes, XmlComponent } from "../../xml-components";
+import { Run } from "../run";
 
 class Break extends XmlComponent {
 
diff --git a/src/docx/paragraph/index.ts b/src/docx/paragraph/index.ts
index 653e1a8e97..77b08885fb 100644
--- a/src/docx/paragraph/index.ts
+++ b/src/docx/paragraph/index.ts
@@ -1,3 +1,5 @@
 export * from "./formatting";
 export * from "./paragraph";
 export * from "./properties";
+export * from "./run";
+
diff --git a/src/docx/paragraph/paragraph.ts b/src/docx/paragraph/paragraph.ts
index fcba366b8f..71661e346f 100644
--- a/src/docx/paragraph/paragraph.ts
+++ b/src/docx/paragraph/paragraph.ts
@@ -1,10 +1,8 @@
 // http://officeopenxml.com/WPparagraph.php
 import { IData } from "../../media/data";
 import { Num } from "../../numbering/num";
-import { Run } from "../run";
-import { PictureRun } from "../run/picture-run";
-import { TextRun } from "../run/text-run";
 import { XmlComponent } from "../xml-components";
+import { PictureRun, Run, TextRun } from "./run";
 
 import { Alignment } from "./formatting/alignment";
 import { ThematicBreak } from "./formatting/border";
diff --git a/src/docx/run/break.spec.ts b/src/docx/paragraph/run/break.spec.ts
similarity index 89%
rename from src/docx/run/break.spec.ts
rename to src/docx/paragraph/run/break.spec.ts
index f34f60bfbc..2a317dd8b2 100644
--- a/src/docx/run/break.spec.ts
+++ b/src/docx/paragraph/run/break.spec.ts
@@ -1,6 +1,6 @@
 import { assert } from "chai";
 
-import { Utility } from "../../tests/utility";
+import { Utility } from "../../../tests/utility";
 import { Break } from "./break";
 
 describe("Break", () => {
diff --git a/src/docx/run/break.ts b/src/docx/paragraph/run/break.ts
similarity index 74%
rename from src/docx/run/break.ts
rename to src/docx/paragraph/run/break.ts
index 75254a09c6..b88ef0dfa8 100644
--- a/src/docx/run/break.ts
+++ b/src/docx/paragraph/run/break.ts
@@ -1,5 +1,5 @@
 // http://officeopenxml.com/WPtextSpecialContent-break.php
-import { XmlComponent } from "../xml-components";
+import { XmlComponent } from "../../xml-components";
 
 export class Break extends XmlComponent {
 
diff --git a/src/docx/run/caps.ts b/src/docx/paragraph/run/caps.ts
similarity index 79%
rename from src/docx/run/caps.ts
rename to src/docx/paragraph/run/caps.ts
index d1e0f8f2cb..1e7bf463c9 100644
--- a/src/docx/run/caps.ts
+++ b/src/docx/paragraph/run/caps.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../xml-components";
+import { XmlComponent } from "../../xml-components";
 
 export class SmallCaps extends XmlComponent {
 
diff --git a/src/docx/run/formatting.ts b/src/docx/paragraph/run/formatting.ts
similarity index 96%
rename from src/docx/run/formatting.ts
rename to src/docx/paragraph/run/formatting.ts
index 2685f07fda..830597c481 100644
--- a/src/docx/run/formatting.ts
+++ b/src/docx/paragraph/run/formatting.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../xml-components";
+import { Attributes, XmlComponent } from "../../xml-components";
 export { Underline } from "./underline";
 export { SubScript, SuperScript } from "./script";
 export { RunFonts } from "./run-fonts";
diff --git a/src/docx/run/index.ts b/src/docx/paragraph/run/index.ts
similarity index 100%
rename from src/docx/run/index.ts
rename to src/docx/paragraph/run/index.ts
diff --git a/src/docx/run/picture-run.ts b/src/docx/paragraph/run/picture-run.ts
similarity index 75%
rename from src/docx/run/picture-run.ts
rename to src/docx/paragraph/run/picture-run.ts
index 038d1fc7bf..57ab1e56a7 100644
--- a/src/docx/run/picture-run.ts
+++ b/src/docx/paragraph/run/picture-run.ts
@@ -1,6 +1,6 @@
-import { IData } from "../../media/data";
+import { IData } from "../../../media/data";
+import { Drawing } from "../../drawing";
 import { Run } from "../run";
-import { Drawing } from "./run-components/drawing";
 
 export class PictureRun extends Run {
 
diff --git a/src/docx/run/properties.ts b/src/docx/paragraph/run/properties.ts
similarity index 77%
rename from src/docx/run/properties.ts
rename to src/docx/paragraph/run/properties.ts
index 7c781fe04c..0f06de0323 100644
--- a/src/docx/run/properties.ts
+++ b/src/docx/paragraph/run/properties.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../xml-components";
+import { XmlComponent } from "../../xml-components";
 
 export class RunProperties extends XmlComponent {
 
diff --git a/src/docx/run/run-components/text.spec.ts b/src/docx/paragraph/run/run-components/text.spec.ts
similarity index 92%
rename from src/docx/run/run-components/text.spec.ts
rename to src/docx/paragraph/run/run-components/text.spec.ts
index 046951ff93..56c6643adc 100644
--- a/src/docx/run/run-components/text.spec.ts
+++ b/src/docx/paragraph/run/run-components/text.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "../../../export/formatter";
+import { Formatter } from "../../../../export/formatter";
 import { Text } from "./text";
 
 describe("Text", () => {
diff --git a/src/docx/run/run-components/text.ts b/src/docx/paragraph/run/run-components/text.ts
similarity index 82%
rename from src/docx/run/run-components/text.ts
rename to src/docx/paragraph/run/run-components/text.ts
index a07cf8f618..a6783d2dfa 100644
--- a/src/docx/run/run-components/text.ts
+++ b/src/docx/paragraph/run/run-components/text.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "../../../xml-components";
 
 class TextAttributes extends XmlAttributeComponent<{space: "default" | "preserve"}> {
     protected xmlKeys = {space: "xml:space"};
diff --git a/src/docx/run/run-fonts.spec.ts b/src/docx/paragraph/run/run-fonts.spec.ts
similarity index 93%
rename from src/docx/run/run-fonts.spec.ts
rename to src/docx/paragraph/run/run-fonts.spec.ts
index cf419a4e18..359635d22b 100644
--- a/src/docx/run/run-fonts.spec.ts
+++ b/src/docx/paragraph/run/run-fonts.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "../../export/formatter";
+import { Formatter } from "../../../export/formatter";
 import { RunFonts } from "./run-fonts";
 
 describe("RunFonts", () => {
diff --git a/src/docx/run/run-fonts.ts b/src/docx/paragraph/run/run-fonts.ts
similarity index 88%
rename from src/docx/run/run-fonts.ts
rename to src/docx/paragraph/run/run-fonts.ts
index 674f1395b9..7f15449739 100644
--- a/src/docx/run/run-fonts.ts
+++ b/src/docx/paragraph/run/run-fonts.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "../../xml-components";
 
 interface IRunFontAttributesProperties {
     ascii: string;
diff --git a/src/docx/run/run.spec.ts b/src/docx/paragraph/run/run.spec.ts
similarity index 97%
rename from src/docx/run/run.spec.ts
rename to src/docx/paragraph/run/run.spec.ts
index 32b277592e..d4b0236304 100644
--- a/src/docx/run/run.spec.ts
+++ b/src/docx/paragraph/run/run.spec.ts
@@ -1,7 +1,7 @@
 import { assert, expect } from "chai";
 
-import { Formatter } from "../../export/formatter";
-import { Utility } from "../../tests/utility";
+import { Formatter } from "../../../export/formatter";
+import { Utility } from "../../../tests/utility";
 import { Run } from "./";
 
 describe("Run", () => {
diff --git a/src/docx/run/run.ts b/src/docx/paragraph/run/run.ts
similarity index 97%
rename from src/docx/run/run.ts
rename to src/docx/paragraph/run/run.ts
index a0b8584a58..4453f4fda3 100644
--- a/src/docx/run/run.ts
+++ b/src/docx/paragraph/run/run.ts
@@ -9,7 +9,7 @@ import { Style } from "./style";
 import { Tab } from "./tab";
 import { Underline } from "./underline";
 
-import { XmlComponent } from "../xml-components";
+import { XmlComponent } from "../../xml-components";
 
 export class Run extends XmlComponent {
     private properties: RunProperties;
diff --git a/src/docx/run/script.spec.ts b/src/docx/paragraph/run/script.spec.ts
similarity index 96%
rename from src/docx/run/script.spec.ts
rename to src/docx/paragraph/run/script.spec.ts
index 5f8cdb3aeb..df3d6fa01a 100644
--- a/src/docx/run/script.spec.ts
+++ b/src/docx/paragraph/run/script.spec.ts
@@ -1,6 +1,6 @@
 import { assert } from "chai";
 
-import { Utility } from "../../tests/utility";
+import { Utility } from "../../../tests/utility";
 import { SubScript, SuperScript } from "./script";
 
 describe("SubScript", () => {
diff --git a/src/docx/run/script.ts b/src/docx/paragraph/run/script.ts
similarity index 86%
rename from src/docx/run/script.ts
rename to src/docx/paragraph/run/script.ts
index a39841709a..3c1bf5bb4d 100644
--- a/src/docx/run/script.ts
+++ b/src/docx/paragraph/run/script.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../xml-components";
+import { Attributes, XmlComponent } from "../../xml-components";
 
 export abstract class VerticalAlign extends XmlComponent {
 
diff --git a/src/docx/run/strike.spec.ts b/src/docx/paragraph/run/strike.spec.ts
similarity index 94%
rename from src/docx/run/strike.spec.ts
rename to src/docx/paragraph/run/strike.spec.ts
index 4b07b308b9..4e266da540 100644
--- a/src/docx/run/strike.spec.ts
+++ b/src/docx/paragraph/run/strike.spec.ts
@@ -1,6 +1,6 @@
 import { assert } from "chai";
 
-import { Utility } from "../../tests/utility";
+import { Utility } from "../../../tests/utility";
 import { DoubleStrike, Strike } from "./formatting";
 
 describe("Strike", () => {
diff --git a/src/docx/run/style.ts b/src/docx/paragraph/run/style.ts
similarity index 79%
rename from src/docx/run/style.ts
rename to src/docx/paragraph/run/style.ts
index 713752377e..31c62f055b 100644
--- a/src/docx/run/style.ts
+++ b/src/docx/paragraph/run/style.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "../../xml-components";
 
 class StyleAttributes extends XmlAttributeComponent<{val: string}> {
     protected xmlKeys = {val: "w:val"};
diff --git a/src/docx/run/tab.spec.ts b/src/docx/paragraph/run/tab.spec.ts
similarity index 88%
rename from src/docx/run/tab.spec.ts
rename to src/docx/paragraph/run/tab.spec.ts
index b709eb88be..4ae84e5f2b 100644
--- a/src/docx/run/tab.spec.ts
+++ b/src/docx/paragraph/run/tab.spec.ts
@@ -1,6 +1,6 @@
 import { assert } from "chai";
 
-import { Utility } from "../../tests/utility";
+import { Utility } from "../../../tests/utility";
 import { Tab } from "./tab";
 
 describe("Tab", () => {
diff --git a/src/docx/run/tab.ts b/src/docx/paragraph/run/tab.ts
similarity index 63%
rename from src/docx/run/tab.ts
rename to src/docx/paragraph/run/tab.ts
index 3e346b6062..e938d199c7 100644
--- a/src/docx/run/tab.ts
+++ b/src/docx/paragraph/run/tab.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../xml-components";
+import { XmlComponent } from "../../xml-components";
 
 export class Tab extends XmlComponent {
 
diff --git a/src/docx/run/text-run.spec.ts b/src/docx/paragraph/run/text-run.spec.ts
similarity index 89%
rename from src/docx/run/text-run.spec.ts
rename to src/docx/paragraph/run/text-run.spec.ts
index 9f52e9a402..7fe1b7c3d4 100644
--- a/src/docx/run/text-run.spec.ts
+++ b/src/docx/paragraph/run/text-run.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "../../export/formatter";
+import { Formatter } from "../../../export/formatter";
 import { TextRun } from "./text-run";
 
 describe("TextRun", () => {
diff --git a/src/docx/run/text-run.ts b/src/docx/paragraph/run/text-run.ts
similarity index 100%
rename from src/docx/run/text-run.ts
rename to src/docx/paragraph/run/text-run.ts
diff --git a/src/docx/run/underline.spec.ts b/src/docx/paragraph/run/underline.spec.ts
similarity index 98%
rename from src/docx/run/underline.spec.ts
rename to src/docx/paragraph/run/underline.spec.ts
index 70c70d8cad..386892a750 100644
--- a/src/docx/run/underline.spec.ts
+++ b/src/docx/paragraph/run/underline.spec.ts
@@ -1,7 +1,7 @@
 import { assert, expect } from "chai";
 
-import { Formatter } from "../../export/formatter";
-import { Utility } from "../../tests/utility";
+import { Formatter } from "../../../export/formatter";
+import { Utility } from "../../../tests/utility";
 import * as u from "./underline";
 
 describe("Underline", () => {
diff --git a/src/docx/run/underline.ts b/src/docx/paragraph/run/underline.ts
similarity index 97%
rename from src/docx/run/underline.ts
rename to src/docx/paragraph/run/underline.ts
index 096f72d29f..b034c39082 100644
--- a/src/docx/run/underline.ts
+++ b/src/docx/paragraph/run/underline.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../xml-components";
+import { Attributes, XmlComponent } from "../../xml-components";
 
 export abstract class BaseUnderline extends XmlComponent {
 
diff --git a/src/export/packer/local.spec.ts b/src/export/packer/local.spec.ts
index 092fe97a6b..572ecdefb2 100644
--- a/src/export/packer/local.spec.ts
+++ b/src/export/packer/local.spec.ts
@@ -5,7 +5,7 @@ import { File } from "../../docx";
 import { Paragraph } from "../../docx/paragraph";
 import { LocalPacker } from "../../export/packer/local";
 
-describe.only("LocalPacker", () => {
+describe("LocalPacker", () => {
     let packer: LocalPacker;
 
     beforeEach(() => {
diff --git a/src/numbering/level.ts b/src/numbering/level.ts
index 15f3abaa8a..856b49c9e3 100644
--- a/src/numbering/level.ts
+++ b/src/numbering/level.ts
@@ -1,7 +1,7 @@
 import * as paragraph from "../docx/paragraph/formatting";
 import { ParagraphProperties } from "../docx/paragraph/properties";
-import * as formatting from "../docx/run/formatting";
-import { RunProperties } from "../docx/run/properties";
+import * as formatting from "../docx/paragraph/run/formatting";
+import { RunProperties } from "../docx/paragraph/run/properties";
 import { Attributes, XmlAttributeComponent, XmlComponent } from "../docx/xml-components";
 
 interface ILevelAttributesProperties {
diff --git a/src/numbering/numbering.ts b/src/numbering/numbering.ts
index b8a601e96c..4fbde9aa8a 100644
--- a/src/numbering/numbering.ts
+++ b/src/numbering/numbering.ts
@@ -1,6 +1,6 @@
 import { DocumentAttributes } from "../docx/document/document-attributes";
 import { Indent } from "../docx/paragraph/formatting";
-import { RunFonts } from "../docx/run/run-fonts";
+import { RunFonts } from "../docx/paragraph/run/run-fonts";
 import { XmlComponent } from "../docx/xml-components";
 import { AbstractNumbering } from "./abstract-numbering";
 import { Num } from "./num";
diff --git a/src/styles/defaults/run-properties.ts b/src/styles/defaults/run-properties.ts
index 898bc34ad1..95bf678f3b 100644
--- a/src/styles/defaults/run-properties.ts
+++ b/src/styles/defaults/run-properties.ts
@@ -1,6 +1,6 @@
-import { Size } from "../../docx/run/formatting";
-import { RunProperties } from "../../docx/run/properties";
-import { RunFonts } from "../../docx/run/run-fonts";
+import { Size } from "../../docx/paragraph/run/formatting";
+import { RunProperties } from "../../docx/paragraph/run/properties";
+import { RunFonts } from "../../docx/paragraph/run/run-fonts";
 import { XmlComponent } from "../../docx/xml-components";
 
 export class RunPropertiesDefaults extends XmlComponent {
diff --git a/src/styles/factory.ts b/src/styles/factory.ts
index 3d65ca8d85..d76183644e 100644
--- a/src/styles/factory.ts
+++ b/src/styles/factory.ts
@@ -1,4 +1,4 @@
-import { Color, Italics, Size } from "../docx/run/formatting";
+import { Color, Italics, Size } from "../docx/paragraph/run/formatting";
 
 import { Styles } from "./";
 // import { DocumentDefaults } from "./defaults";
diff --git a/src/styles/style/index.ts b/src/styles/style/index.ts
index 349565e0f6..6464886e2e 100644
--- a/src/styles/style/index.ts
+++ b/src/styles/style/index.ts
@@ -1,6 +1,6 @@
 import * as paragraph from "../../docx/paragraph";
-import * as formatting from "../../docx/run/formatting";
-import { RunProperties } from "../../docx/run/properties";
+import * as formatting from "../../docx/paragraph/run/formatting";
+import { RunProperties } from "../../docx/paragraph/run/properties";
 import { XmlAttributeComponent, XmlComponent } from "../../docx/xml-components";
 
 import { BasedOn, Name, Next, QuickFormat } from "./components";