diff --git a/package.json b/package.json
index 4c41f92e12..f08aeec4fe 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "description": "Generate .docx documents with JavaScript (formerly Office-Clippy)",
   "main": "build/index.js",
   "scripts": {
+    "pretest": "rimraf ./build",
     "test": "mocha-webpack \"src/**/*.ts\"",
     "prepublishOnly": "npm run build",
     "lint": "tslint --project .",
diff --git a/src/export/formatter.ts b/src/export/formatter.ts
index d2e4d58ca2..95c4e38e78 100644
--- a/src/export/formatter.ts
+++ b/src/export/formatter.ts
@@ -1,5 +1,5 @@
-import { BaseXmlComponent } from "../file/xml-components";
-import { IXmlableObject } from "../file/xml-components/xmlable-object";
+import { BaseXmlComponent } from "file/xml-components";
+import { IXmlableObject } from "file/xml-components/xmlable-object";
 
 export class Formatter {
     public format(input: BaseXmlComponent): IXmlableObject {
diff --git a/src/export/packer/compiler.ts b/src/export/packer/compiler.ts
index 3604f41ed2..45be0d7a15 100644
--- a/src/export/packer/compiler.ts
+++ b/src/export/packer/compiler.ts
@@ -4,7 +4,7 @@ import * as fs from "fs";
 import * as path from "path";
 import * as xml from "xml";
 
-import { File } from "../../file";
+import { File } from "file";
 import { Formatter } from "../formatter";
 
 const TEMPLATE_PATH = path.resolve(__dirname, "../../../template");
diff --git a/src/export/packer/express.ts b/src/export/packer/express.ts
index 2dfb7b4345..4c6a573d4f 100644
--- a/src/export/packer/express.ts
+++ b/src/export/packer/express.ts
@@ -1,6 +1,6 @@
 import * as express from "express";
 
-import { File } from "../../file";
+import { File } from "file";
 import { Compiler } from "./compiler";
 import { IPacker } from "./packer";
 
diff --git a/src/file/document/body/body.ts b/src/file/document/body/body.ts
index 993d353573..24cb1bf8bc 100644
--- a/src/file/document/body/body.ts
+++ b/src/file/document/body/body.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../xml-components";
+import { XmlComponent } from "file/xml-components";
 
 export class Body extends XmlComponent {
 
diff --git a/src/file/document/body/columns.ts b/src/file/document/body/columns.ts
index 3a1b3a1f60..0f66904faa 100644
--- a/src/file/document/body/columns.ts
+++ b/src/file/document/body/columns.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../../xml-components";
+import { Attributes, XmlComponent } from "file/xml-components";
 
 export class Columns extends XmlComponent {
 
diff --git a/src/file/document/body/doc-grid.ts b/src/file/document/body/doc-grid.ts
index ec10ef4830..5b2f280014 100644
--- a/src/file/document/body/doc-grid.ts
+++ b/src/file/document/body/doc-grid.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../../xml-components";
+import { Attributes, XmlComponent } from "file/xml-components";
 
 export class DocumentGrid extends XmlComponent {
 
diff --git a/src/file/document/body/page-margin.ts b/src/file/document/body/page-margin.ts
index 6c98ecf8c2..b02c788c5f 100644
--- a/src/file/document/body/page-margin.ts
+++ b/src/file/document/body/page-margin.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../../xml-components";
+import { Attributes, XmlComponent } from "file/xml-components";
 
 export class PageMargin extends XmlComponent {
 
diff --git a/src/file/document/body/page-size.ts b/src/file/document/body/page-size.ts
index 8259326347..cda39d728e 100644
--- a/src/file/document/body/page-size.ts
+++ b/src/file/document/body/page-size.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../../xml-components";
+import { Attributes, XmlComponent } from "file/xml-components";
 
 export class PageSize extends XmlComponent {
 
diff --git a/src/file/document/body/section-properties.ts b/src/file/document/body/section-properties.ts
index c2d556de33..c112674f44 100644
--- a/src/file/document/body/section-properties.ts
+++ b/src/file/document/body/section-properties.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../../xml-components";
+import { Attributes, XmlComponent } from "file/xml-components";
 import { Columns } from "./columns";
 import { DocumentGrid } from "./doc-grid";
 import { PageMargin } from "./page-margin";
diff --git a/src/file/document/document-attributes.ts b/src/file/document/document-attributes.ts
index 88031719e9..68df58ca61 100644
--- a/src/file/document/document-attributes.ts
+++ b/src/file/document/document-attributes.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "../xml-components";
+import { XmlAttributeComponent } from "file/xml-components";
 
 export interface IDocumentAttributesProperties {
     wpc?: string;
diff --git a/src/file/document/document.ts b/src/file/document/document.ts
index 74f602eb5e..23b73a97fd 100644
--- a/src/file/document/document.ts
+++ b/src/file/document/document.ts
@@ -1,7 +1,7 @@
 // http://officeopenxml.com/WPdocument.php
+import { XmlComponent } from "file/xml-components";
 import { Paragraph } from "../paragraph";
 import { Table } from "../table";
-import { XmlComponent } from "../xml-components";
 import { Body } from "./body";
 import { DocumentAttributes } from "./document-attributes";
 
diff --git a/src/file/drawing/index.ts b/src/file/drawing/index.ts
index b21db46885..fe79f86673 100644
--- a/src/file/drawing/index.ts
+++ b/src/file/drawing/index.ts
@@ -1,5 +1,5 @@
-import { IData } from "../media";
-import { XmlComponent } from "../xml-components";
+import { IData } from "file/media";
+import { XmlComponent } from "file/xml-components";
 import { Inline } from "./inline";
 
 export class Drawing extends XmlComponent {
diff --git a/src/file/drawing/inline/graphic/graphic-data/index.ts b/src/file/drawing/inline/graphic/graphic-data/index.ts
index c1d427a4c9..0f462b62ae 100644
--- a/src/file/drawing/inline/graphic/graphic-data/index.ts
+++ b/src/file/drawing/inline/graphic/graphic-data/index.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../xml-components";
+import { XmlComponent } from "file/xml-components";
 import { Pic } from "./pic";
 
 export class GraphicData extends XmlComponent {
diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts b/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts
index a97e007ee3..69b6bf40a4 100644
--- a/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts
+++ b/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../../../xml-components";
+import { XmlComponent } from "file/xml-components";
 import { Blip } from "./blip";
 import { SourceRectangle } from "./source-rectangle";
 import { Stretch } from "./stretch";
diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts b/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts
index 2a8f1a04cb..c4aca1f156 100644
--- a/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts
+++ b/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../../../../../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 
 interface IBlipProperties {
     embed: string;
diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts b/src/file/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts
index ff8429c110..c944ebbc77 100644
--- a/src/file/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts
+++ b/src/file/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../../../xml-components";
+import { XmlComponent } from "file/xml-components";
 
 export class SourceRectangle extends XmlComponent {
 
diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts b/src/file/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts
index b2a612f25e..2de9775885 100644
--- a/src/file/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts
+++ b/src/file/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../../../xml-components";
+import { XmlComponent } from "file/xml-components";
 
 class FillRectangle extends XmlComponent {
 
diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/index.ts b/src/file/drawing/inline/graphic/graphic-data/pic/index.ts
index a4598fb4af..b7907e20dc 100644
--- a/src/file/drawing/inline/graphic/graphic-data/pic/index.ts
+++ b/src/file/drawing/inline/graphic/graphic-data/pic/index.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../../xml-components";
+import { XmlComponent } from "file/xml-components";
 import { BlipFill } from "./blip/blip-fill";
 
 export class Pic extends XmlComponent {
diff --git a/src/file/drawing/inline/graphic/index.ts b/src/file/drawing/inline/graphic/index.ts
index 88e90f95cc..81251fd41c 100644
--- a/src/file/drawing/inline/graphic/index.ts
+++ b/src/file/drawing/inline/graphic/index.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 import { GraphicData } from "./graphic-data";
 
 interface IGraphicProperties {
diff --git a/src/file/drawing/inline/index.ts b/src/file/drawing/inline/index.ts
index 4d854de96d..3e7ab22831 100644
--- a/src/file/drawing/inline/index.ts
+++ b/src/file/drawing/inline/index.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../xml-components";
+import { XmlComponent } from "file/xml-components";
 import { Graphic } from "./graphic";
 
 export class Inline extends XmlComponent {
diff --git a/src/file/numbering/abstract-numbering.ts b/src/file/numbering/abstract-numbering.ts
index 2565444eef..eb64487cdc 100644
--- a/src/file/numbering/abstract-numbering.ts
+++ b/src/file/numbering/abstract-numbering.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 import { Level } from "./level";
 import { MultiLevelType } from "./multi-level-type";
 
diff --git a/src/file/numbering/level.ts b/src/file/numbering/level.ts
index 3130fad96f..801746ca88 100644
--- a/src/file/numbering/level.ts
+++ b/src/file/numbering/level.ts
@@ -1,8 +1,8 @@
+import { Attributes, XmlAttributeComponent, XmlComponent } from "file/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/file/numbering/multi-level-type.ts b/src/file/numbering/multi-level-type.ts
index d17e1a19b0..4b688e35fb 100644
--- a/src/file/numbering/multi-level-type.ts
+++ b/src/file/numbering/multi-level-type.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../xml-components";
+import { Attributes, XmlComponent } from "file/xml-components";
 
 export class MultiLevelType extends XmlComponent {
 
diff --git a/src/file/numbering/num.ts b/src/file/numbering/num.ts
index 0f9bd7e5f8..e9362a3c9e 100644
--- a/src/file/numbering/num.ts
+++ b/src/file/numbering/num.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlAttributeComponent, XmlComponent } from "../xml-components";
+import { Attributes, XmlAttributeComponent, XmlComponent } from "file/xml-components";
 import { LevelForOverride } from "./level";
 
 class AbstractNumId extends XmlComponent {
diff --git a/src/file/numbering/numbering.ts b/src/file/numbering/numbering.ts
index e2f146771f..59caa49951 100644
--- a/src/file/numbering/numbering.ts
+++ b/src/file/numbering/numbering.ts
@@ -1,7 +1,7 @@
+import { XmlComponent } from "file/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/file/paragraph/formatting/alignment.ts b/src/file/paragraph/formatting/alignment.ts
index 5923f0d623..a260aa18ff 100644
--- a/src/file/paragraph/formatting/alignment.ts
+++ b/src/file/paragraph/formatting/alignment.ts
@@ -1,5 +1,5 @@
 // http://officeopenxml.com/WPalignment.php
-import { XmlAttributeComponent, XmlComponent } from "../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 
 export type AlignmentOptions = "left" | "center" | "right" | "both";
 
diff --git a/src/file/paragraph/formatting/border.ts b/src/file/paragraph/formatting/border.ts
index 11eb7c45aa..b8c5142fde 100644
--- a/src/file/paragraph/formatting/border.ts
+++ b/src/file/paragraph/formatting/border.ts
@@ -1,5 +1,5 @@
 // http://officeopenxml.com/WPborders.php
-import { Attributes, XmlComponent } from "../../xml-components";
+import { Attributes, XmlComponent } from "file/xml-components";
 
 class Border extends XmlComponent {
 
diff --git a/src/file/paragraph/formatting/indent.ts b/src/file/paragraph/formatting/indent.ts
index 67ca37b905..98ab4e0212 100644
--- a/src/file/paragraph/formatting/indent.ts
+++ b/src/file/paragraph/formatting/indent.ts
@@ -1,5 +1,5 @@
 // http://officeopenxml.com/WPindentation.php
-import { XmlAttributeComponent, XmlComponent } from "../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 
 interface IIndentAttributesProperties {
     left?: number;
diff --git a/src/file/paragraph/formatting/keep.ts b/src/file/paragraph/formatting/keep.ts
index 1e3e27c422..5f1abb53f8 100644
--- a/src/file/paragraph/formatting/keep.ts
+++ b/src/file/paragraph/formatting/keep.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../xml-components";
+import { XmlComponent } from "file/xml-components";
 
 export class KeepLines extends XmlComponent {
     constructor() {
diff --git a/src/file/paragraph/formatting/page-break.ts b/src/file/paragraph/formatting/page-break.ts
index 13c5e68e2b..c35d5f10af 100644
--- a/src/file/paragraph/formatting/page-break.ts
+++ b/src/file/paragraph/formatting/page-break.ts
@@ -1,5 +1,5 @@
 // http://officeopenxml.com/WPtextSpecialContent-break.php
-import { Attributes, XmlComponent } from "../../xml-components";
+import { Attributes, XmlComponent } from "file/xml-components";
 import { Run } from "../run";
 
 class Break extends XmlComponent {
diff --git a/src/file/paragraph/formatting/spacing.ts b/src/file/paragraph/formatting/spacing.ts
index 23df8523ac..fceab8af8c 100644
--- a/src/file/paragraph/formatting/spacing.ts
+++ b/src/file/paragraph/formatting/spacing.ts
@@ -1,5 +1,5 @@
 // http://officeopenxml.com/WPspacing.php
-import { XmlAttributeComponent, XmlComponent } from "../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 
 export interface ISpacingProperties {
     after?: number;
diff --git a/src/file/paragraph/formatting/style.ts b/src/file/paragraph/formatting/style.ts
index 4f73e0f2b5..08d6500c34 100644
--- a/src/file/paragraph/formatting/style.ts
+++ b/src/file/paragraph/formatting/style.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../../xml-components";
+import { Attributes, XmlComponent } from "file/xml-components";
 
 export class Style extends XmlComponent {
 
diff --git a/src/file/paragraph/formatting/tab-stop.ts b/src/file/paragraph/formatting/tab-stop.ts
index 4042b7d47d..cd65ae76f5 100644
--- a/src/file/paragraph/formatting/tab-stop.ts
+++ b/src/file/paragraph/formatting/tab-stop.ts
@@ -1,5 +1,5 @@
 // http://officeopenxml.com/WPtab.php
-import { XmlAttributeComponent, XmlComponent } from "../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 
 export class TabStop extends XmlComponent {
 
diff --git a/src/file/paragraph/formatting/unordered-list.ts b/src/file/paragraph/formatting/unordered-list.ts
index 50af69c20d..82a432603a 100644
--- a/src/file/paragraph/formatting/unordered-list.ts
+++ b/src/file/paragraph/formatting/unordered-list.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../../xml-components";
+import { Attributes, XmlComponent } from "file/xml-components";
 
 export class NumberProperties extends XmlComponent {
 
diff --git a/src/file/paragraph/paragraph.ts b/src/file/paragraph/paragraph.ts
index 21e8ac9ad6..766b7d7d14 100644
--- a/src/file/paragraph/paragraph.ts
+++ b/src/file/paragraph/paragraph.ts
@@ -1,7 +1,7 @@
 // http://officeopenxml.com/WPparagraph.php
+import { IData } from "file/media";
+import { Num } from "file/numbering/num";
 import { XmlComponent } from "file/xml-components";
-import { IData } from "../media/data";
-import { Num } from "../numbering/num";
 import { PictureRun, Run, TextRun } from "./run";
 
 import { Alignment } from "./formatting/alignment";
diff --git a/src/file/paragraph/properties.ts b/src/file/paragraph/properties.ts
index 16013986c0..7b54f23350 100644
--- a/src/file/paragraph/properties.ts
+++ b/src/file/paragraph/properties.ts
@@ -1,5 +1,5 @@
 // http://officeopenxml.com/WPparagraphProperties.php
-import { XmlComponent } from "../xml-components";
+import { XmlComponent } from "file/xml-components";
 
 export class ParagraphProperties extends XmlComponent {
 
diff --git a/src/file/paragraph/run/break.ts b/src/file/paragraph/run/break.ts
index b88ef0dfa8..a40abea558 100644
--- a/src/file/paragraph/run/break.ts
+++ b/src/file/paragraph/run/break.ts
@@ -1,5 +1,5 @@
 // http://officeopenxml.com/WPtextSpecialContent-break.php
-import { XmlComponent } from "../../xml-components";
+import { XmlComponent } from "file/xml-components";
 
 export class Break extends XmlComponent {
 
diff --git a/src/file/paragraph/run/caps.ts b/src/file/paragraph/run/caps.ts
index 1e7bf463c9..bc12d6e256 100644
--- a/src/file/paragraph/run/caps.ts
+++ b/src/file/paragraph/run/caps.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../xml-components";
+import { XmlComponent } from "file/xml-components";
 
 export class SmallCaps extends XmlComponent {
 
diff --git a/src/file/paragraph/run/formatting.ts b/src/file/paragraph/run/formatting.ts
index 830597c481..f6abf1a770 100644
--- a/src/file/paragraph/run/formatting.ts
+++ b/src/file/paragraph/run/formatting.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../../xml-components";
+import { Attributes, XmlComponent } from "file/xml-components";
 export { Underline } from "./underline";
 export { SubScript, SuperScript } from "./script";
 export { RunFonts } from "./run-fonts";
diff --git a/src/file/paragraph/run/properties.ts b/src/file/paragraph/run/properties.ts
index 0f06de0323..191aaf715c 100644
--- a/src/file/paragraph/run/properties.ts
+++ b/src/file/paragraph/run/properties.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../xml-components";
+import { XmlComponent } from "file/xml-components";
 
 export class RunProperties extends XmlComponent {
 
diff --git a/src/file/paragraph/run/run-components/text.ts b/src/file/paragraph/run/run-components/text.ts
index a6783d2dfa..36bd17c507 100644
--- a/src/file/paragraph/run/run-components/text.ts
+++ b/src/file/paragraph/run/run-components/text.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 
 class TextAttributes extends XmlAttributeComponent<{space: "default" | "preserve"}> {
     protected xmlKeys = {space: "xml:space"};
diff --git a/src/file/paragraph/run/run-fonts.ts b/src/file/paragraph/run/run-fonts.ts
index 7f15449739..61f8e8758e 100644
--- a/src/file/paragraph/run/run-fonts.ts
+++ b/src/file/paragraph/run/run-fonts.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 
 interface IRunFontAttributesProperties {
     ascii: string;
diff --git a/src/file/paragraph/run/run.ts b/src/file/paragraph/run/run.ts
index 4453f4fda3..243cea68d3 100644
--- a/src/file/paragraph/run/run.ts
+++ b/src/file/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 "file/xml-components";
 
 export class Run extends XmlComponent {
     private properties: RunProperties;
diff --git a/src/file/paragraph/run/script.ts b/src/file/paragraph/run/script.ts
index 3c1bf5bb4d..88f0dbddda 100644
--- a/src/file/paragraph/run/script.ts
+++ b/src/file/paragraph/run/script.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../../xml-components";
+import { Attributes, XmlComponent } from "file/xml-components";
 
 export abstract class VerticalAlign extends XmlComponent {
 
diff --git a/src/file/paragraph/run/style.ts b/src/file/paragraph/run/style.ts
index 31c62f055b..5382724eb7 100644
--- a/src/file/paragraph/run/style.ts
+++ b/src/file/paragraph/run/style.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 
 class StyleAttributes extends XmlAttributeComponent<{val: string}> {
     protected xmlKeys = {val: "w:val"};
diff --git a/src/file/paragraph/run/tab.ts b/src/file/paragraph/run/tab.ts
index e938d199c7..c6c4a2f0d7 100644
--- a/src/file/paragraph/run/tab.ts
+++ b/src/file/paragraph/run/tab.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../xml-components";
+import { XmlComponent } from "file/xml-components";
 
 export class Tab extends XmlComponent {
 
diff --git a/src/file/paragraph/run/underline.ts b/src/file/paragraph/run/underline.ts
index b034c39082..f83b5479f9 100644
--- a/src/file/paragraph/run/underline.ts
+++ b/src/file/paragraph/run/underline.ts
@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../../xml-components";
+import { Attributes, XmlComponent } from "file/xml-components";
 
 export abstract class BaseUnderline extends XmlComponent {
 
diff --git a/src/file/properties/components.ts b/src/file/properties/components.ts
index bfcf28f5f1..f4dbd8fd9a 100644
--- a/src/file/properties/components.ts
+++ b/src/file/properties/components.ts
@@ -1,5 +1,5 @@
+import { XmlComponent } from "file/xml-components";
 import { DocumentAttributes } from "../document/document-attributes";
-import { XmlComponent } from "../xml-components";
 
 export class Title extends XmlComponent {
 
diff --git a/src/file/properties/properties.ts b/src/file/properties/properties.ts
index bd3229b434..ca01056fb2 100644
--- a/src/file/properties/properties.ts
+++ b/src/file/properties/properties.ts
@@ -1,5 +1,5 @@
+import { XmlComponent } from "file/xml-components";
 import { DocumentAttributes } from "../document/document-attributes";
-import { XmlComponent } from "../xml-components";
 import { Created, Creator, Description, Keywords, LastModifiedBy, Modified, Revision, Subject, Title } from "./components";
 
 export interface IPropertiesOptions {
diff --git a/src/file/relationships/attributes.ts b/src/file/relationships/attributes.ts
index 8765d314f6..54cbd62472 100644
--- a/src/file/relationships/attributes.ts
+++ b/src/file/relationships/attributes.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "../xml-components";
+import { XmlAttributeComponent } from "file/xml-components";
 
 export interface IRelationshipsAttributesProperties {
     xmlns: string;
diff --git a/src/file/relationships/relationships.ts b/src/file/relationships/relationships.ts
index 972e056263..d9c0562a74 100644
--- a/src/file/relationships/relationships.ts
+++ b/src/file/relationships/relationships.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../xml-components";
+import { XmlComponent } from "file/xml-components";
 import { RelationshipsAttributes } from "./attributes";
 
 export class Relationships extends XmlComponent {
diff --git a/src/file/styles/defaults/index.ts b/src/file/styles/defaults/index.ts
index 074baea968..93211ac5ec 100644
--- a/src/file/styles/defaults/index.ts
+++ b/src/file/styles/defaults/index.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../xml-components";
+import { XmlComponent } from "file/xml-components";
 import { ParagraphPropertiesDefaults } from "./paragraph-properties";
 import { RunPropertiesDefaults } from "./run-properties";
 
diff --git a/src/file/styles/defaults/paragraph-properties.ts b/src/file/styles/defaults/paragraph-properties.ts
index f8641e3a85..4fe9c341ce 100644
--- a/src/file/styles/defaults/paragraph-properties.ts
+++ b/src/file/styles/defaults/paragraph-properties.ts
@@ -1,5 +1,5 @@
+import { XmlComponent } from "file/xml-components";
 import { ParagraphProperties } from "../../paragraph/properties";
-import { XmlComponent } from "../../xml-components";
 
 export class ParagraphPropertiesDefaults extends XmlComponent {
 
diff --git a/src/file/styles/defaults/run-properties.ts b/src/file/styles/defaults/run-properties.ts
index 3a7c619417..242aa3e58d 100644
--- a/src/file/styles/defaults/run-properties.ts
+++ b/src/file/styles/defaults/run-properties.ts
@@ -1,7 +1,7 @@
+import { XmlComponent } from "file/xml-components";
 import { Size } from "../../paragraph/run/formatting";
 import { RunProperties } from "../../paragraph/run/properties";
 import { RunFonts } from "../../paragraph/run/run-fonts";
-import { XmlComponent } from "../../xml-components";
 
 export class RunPropertiesDefaults extends XmlComponent {
     private properties: RunProperties;
diff --git a/src/file/styles/index.ts b/src/file/styles/index.ts
index f05afd8e68..9c54752998 100644
--- a/src/file/styles/index.ts
+++ b/src/file/styles/index.ts
@@ -1,5 +1,5 @@
+import { XmlComponent } from "file/xml-components";
 import { DocumentAttributes } from "../document/document-attributes";
-import { XmlComponent } from "../xml-components";
 import { DocumentDefaults } from "./defaults";
 import { ParagraphStyle } from "./style";
 
diff --git a/src/file/styles/latent-styles/exceptions.ts b/src/file/styles/latent-styles/exceptions.ts
index e547aeb352..9bede8257f 100644
--- a/src/file/styles/latent-styles/exceptions.ts
+++ b/src/file/styles/latent-styles/exceptions.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 
 export interface ILatentStyleExceptionAttributesProperties {
     name?: string;
diff --git a/src/file/styles/latent-styles/index.ts b/src/file/styles/latent-styles/index.ts
index 6cde391eb2..5ab51e1c4e 100644
--- a/src/file/styles/latent-styles/index.ts
+++ b/src/file/styles/latent-styles/index.ts
@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../xml-components";
+import { XmlComponent } from "file/xml-components";
 import { LatentStyleException } from "./exceptions";
 
 export class LatentStyles extends XmlComponent {
diff --git a/src/file/styles/style/components.ts b/src/file/styles/style/components.ts
index df5c8b62c1..199b1f064e 100644
--- a/src/file/styles/style/components.ts
+++ b/src/file/styles/style/components.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 
 interface IComponentAttributes {
     val: string;
diff --git a/src/file/styles/style/index.ts b/src/file/styles/style/index.ts
index fc75bb99d9..3f45c5805c 100644
--- a/src/file/styles/style/index.ts
+++ b/src/file/styles/style/index.ts
@@ -1,7 +1,7 @@
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 import * as paragraph from "../../paragraph";
 import * as formatting from "../../paragraph/run/formatting";
 import { RunProperties } from "../../paragraph/run/properties";
-import { XmlAttributeComponent, XmlComponent } from "../../xml-components";
 
 import { BasedOn, Name, Next, QuickFormat } from "./components";
 
diff --git a/src/file/table/grid.ts b/src/file/table/grid.ts
index 3731891177..16bab3fa75 100644
--- a/src/file/table/grid.ts
+++ b/src/file/table/grid.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 
 export class TableGrid extends XmlComponent {
     constructor(cols: number[]) {
diff --git a/src/file/table/properties.ts b/src/file/table/properties.ts
index 09ced45d00..c11797c1fd 100644
--- a/src/file/table/properties.ts
+++ b/src/file/table/properties.ts
@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 
 export type WidthTypes = "dxa" | "pct" | "nil" | "auto";
 
diff --git a/src/file/table/table.ts b/src/file/table/table.ts
index 9969926fb7..43a41cd78e 100644
--- a/src/file/table/table.ts
+++ b/src/file/table/table.ts
@@ -1,6 +1,6 @@
+import { XmlComponent } from "file/xml-components";
+import { IXmlableObject } from "file/xml-components/xmlable-object";
 import { Paragraph } from "../paragraph";
-import { XmlComponent } from "../xml-components";
-import { IXmlableObject } from "../xml-components/xmlable-object";
 import { TableGrid } from "./grid";
 import { TableProperties, WidthTypes } from "./properties";