diff --git a/src/file/drawing/anchor/anchor-attributes.ts b/src/file/drawing/anchor/anchor-attributes.ts
index abe8aac5d7..cfd8ad3144 100644
--- a/src/file/drawing/anchor/anchor-attributes.ts
+++ b/src/file/drawing/anchor/anchor-attributes.ts
@@ -1,7 +1,7 @@
 import { XmlAttributeComponent } from "file/xml-components";
-import { Distance } from "../drawing";
+import { IDistance } from "../drawing";
 
-export interface IAnchorAttributes extends Distance {
+export interface IAnchorAttributes extends IDistance {
     allowOverlap?: "0" | "1";
     behindDoc?: "0" | "1";
     layoutInCell?: "0" | "1";
diff --git a/src/file/drawing/anchor/anchor.spec.ts b/src/file/drawing/anchor/anchor.spec.ts
index a071377fab..58adefd174 100644
--- a/src/file/drawing/anchor/anchor.spec.ts
+++ b/src/file/drawing/anchor/anchor.spec.ts
@@ -1,10 +1,10 @@
 import { assert } from "chai";
 
 import { Utility } from "../../../tests/utility";
-import { DrawingOptions, TextWrapStyle } from ".././";
+import { IDrawingOptions, TextWrapStyle } from ".././";
 import { Anchor } from "./";
 
-function createDrawing(drawingOptions: DrawingOptions) {
+function createDrawing(drawingOptions: IDrawingOptions): Anchor {
     return new Anchor(
         1,
         {
diff --git a/src/file/drawing/anchor/anchor.ts b/src/file/drawing/anchor/anchor.ts
index ad7a266aa2..7dbdfca0bc 100644
--- a/src/file/drawing/anchor/anchor.ts
+++ b/src/file/drawing/anchor/anchor.ts
@@ -1,24 +1,24 @@
 // http://officeopenxml.com/drwPicFloating.php
 import { IMediaDataDimensions } from "file/media";
 import { XmlComponent } from "file/xml-components";
+import { IDrawingOptions } from "../drawing";
+import {
+    HorizontalPosition,
+    HorizontalPositionRelativeFrom,
+    IFloating,
+    SimplePos,
+    VerticalPosition,
+    VerticalPositionRelativeFrom,
+} from "../floating";
+import { Graphic } from "../inline/graphic";
+import { TextWrapStyle, WrapNone, WrapSquare, WrapTight, WrapTopAndBottom } from "../text-wrap";
 import { DocProperties } from "./../doc-properties/doc-properties";
 import { EffectExtent } from "./../effect-extent/effect-extent";
 import { Extent } from "./../extent/extent";
-import { Graphic } from "./../graphic";
 import { GraphicFrameProperties } from "./../graphic-frame/graphic-frame-properties";
 import { AnchorAttributes } from "./anchor-attributes";
-import { DrawingOptions } from "../drawing";
-import {
-    SimplePos,
-    HorizontalPosition,
-    VerticalPosition,
-    Floating,
-    VerticalPositionRelativeFrom,
-    HorizontalPositionRelativeFrom,
-} from "../floating";
-import { WrapNone, TextWrapStyle, WrapSquare, WrapTight, WrapTopAndBottom } from "../text-wrap";
 
-const defaultOptions: Floating = {
+const defaultOptions: IFloating = {
     allowOverlap: true,
     behindDocument: false,
     lockAnchor: false,
@@ -34,7 +34,7 @@ const defaultOptions: Floating = {
 };
 
 export class Anchor extends XmlComponent {
-    constructor(referenceId: number, dimensions: IMediaDataDimensions, drawingOptions: DrawingOptions) {
+    constructor(referenceId: number, dimensions: IMediaDataDimensions, drawingOptions: IDrawingOptions) {
         super("wp:anchor");
 
         const floating = {
diff --git a/src/file/drawing/drawing.spec.ts b/src/file/drawing/drawing.spec.ts
index 1e70aecda5..cf3f926315 100644
--- a/src/file/drawing/drawing.spec.ts
+++ b/src/file/drawing/drawing.spec.ts
@@ -2,9 +2,9 @@ import { assert } from "chai";
 import * as fs from "fs";
 
 import { Utility } from "../../tests/utility";
-import { Drawing, DrawingOptions, PlacementPosition } from "./";
+import { Drawing, IDrawingOptions, PlacementPosition } from "./";
 
-function createDrawing(drawingOptions?: DrawingOptions) {
+function createDrawing(drawingOptions?: IDrawingOptions): Drawing {
     const path = "./demo/images/image1.jpeg";
     return new Drawing(
         {
diff --git a/src/file/drawing/drawing.ts b/src/file/drawing/drawing.ts
index 4646d0cc87..4c3db93b3a 100644
--- a/src/file/drawing/drawing.ts
+++ b/src/file/drawing/drawing.ts
@@ -1,36 +1,36 @@
 import { IMediaData } from "file/media";
 import { XmlComponent } from "file/xml-components";
-import { Inline } from "./inline";
 import { Anchor } from "./anchor";
-import { TextWrapping } from "./text-wrap";
-import { Floating } from "./floating";
+import { IFloating } from "./floating";
+import { Inline } from "./inline";
+import { ITextWrapping } from "./text-wrap";
 
 export enum PlacementPosition {
     INLINE,
     FLOATING,
 }
 
-export interface Distance {
+export interface IDistance {
     distT?: number;
     distB?: number;
     distL?: number;
     distR?: number;
 }
 
-export interface DrawingOptions {
+export interface IDrawingOptions {
     position?: PlacementPosition;
-    textWrapping?: TextWrapping;
-    floating?: Floating;
+    textWrapping?: ITextWrapping;
+    floating?: IFloating;
 }
 
-const defaultDrawingOptions: DrawingOptions = {
+const defaultDrawingOptions: IDrawingOptions = {
     position: PlacementPosition.INLINE,
 };
 
 export class Drawing extends XmlComponent {
     private inline: Inline;
 
-    constructor(imageData: IMediaData, drawingOptions?: DrawingOptions) {
+    constructor(imageData: IMediaData, drawingOptions?: IDrawingOptions) {
         super("w:drawing");
 
         if (imageData === undefined) {
@@ -42,7 +42,6 @@ export class Drawing extends XmlComponent {
             ...drawingOptions,
         };
 
-
         if (mergedOptions.position === PlacementPosition.INLINE) {
             this.inline = new Inline(imageData.referenceId, imageData.dimensions);
             this.root.push(this.inline);
diff --git a/src/file/drawing/floating/align.spec.ts b/src/file/drawing/floating/align.spec.ts
index 119366d30f..5ec77d6fd0 100644
--- a/src/file/drawing/floating/align.spec.ts
+++ b/src/file/drawing/floating/align.spec.ts
@@ -1,8 +1,8 @@
 import { assert } from "chai";
 
-import { Align } from "./align";
-import { Utility } from "../../../tests/utility";
 import { VerticalPositionAlign } from ".";
+import { Utility } from "../../../tests/utility";
+import { Align } from "./align";
 
 describe("Align", () => {
     describe("#constructor()", () => {
diff --git a/src/file/drawing/floating/floating-position.ts b/src/file/drawing/floating/floating-position.ts
index f9c4547776..7039846bc7 100644
--- a/src/file/drawing/floating/floating-position.ts
+++ b/src/file/drawing/floating/floating-position.ts
@@ -38,21 +38,21 @@ export enum VerticalPositionAlign {
     TOP = "top",
 }
 
-export interface HorizontalPositionOptions {
+export interface IHorizontalPositionOptions {
     relative: HorizontalPositionRelativeFrom;
     align?: HorizontalPositionAlign;
     offset?: number;
 }
 
-export interface VerticalPositionOptions {
+export interface IVerticalPositionOptions {
     relative: VerticalPositionRelativeFrom;
     align?: VerticalPositionAlign;
     offset?: number;
 }
 
-export interface Floating {
-    horizontalPosition: HorizontalPositionOptions;
-    verticalPosition: VerticalPositionOptions;
+export interface IFloating {
+    horizontalPosition: IHorizontalPositionOptions;
+    verticalPosition: IVerticalPositionOptions;
     allowOverlap?: boolean;
     lockAnchor?: boolean;
     behindDocument?: boolean;
diff --git a/src/file/drawing/floating/horizontal-position.spec.ts b/src/file/drawing/floating/horizontal-position.spec.ts
index 69415685e1..1b139b47be 100644
--- a/src/file/drawing/floating/horizontal-position.spec.ts
+++ b/src/file/drawing/floating/horizontal-position.spec.ts
@@ -1,8 +1,8 @@
 import { assert } from "chai";
 
-import { HorizontalPosition } from "./horizontal-position";
+import { HorizontalPositionAlign, HorizontalPositionRelativeFrom } from ".";
 import { Utility } from "../../../tests/utility";
-import { HorizontalPositionRelativeFrom, HorizontalPositionAlign } from ".";
+import { HorizontalPosition } from "./horizontal-position";
 
 describe("HorizontalPosition", () => {
     describe("#constructor()", () => {
diff --git a/src/file/drawing/floating/horizontal-position.ts b/src/file/drawing/floating/horizontal-position.ts
index 5b0a0e68ca..f0725aa857 100644
--- a/src/file/drawing/floating/horizontal-position.ts
+++ b/src/file/drawing/floating/horizontal-position.ts
@@ -1,7 +1,7 @@
 // http://officeopenxml.com/drwPicFloating-position.php
-import { XmlComponent, XmlAttributeComponent } from "file/xml-components";
-import { HorizontalPositionRelativeFrom, HorizontalPositionOptions } from "./floating-position";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 import { Align } from "./align";
+import { HorizontalPositionRelativeFrom, IHorizontalPositionOptions } from "./floating-position";
 import { PositionOffset } from "./position-offset";
 
 interface IHorizontalPositionAttributes {
@@ -15,7 +15,7 @@ class HorizontalPositionAttributes extends XmlAttributeComponent<IHorizontalPosi
 }
 
 export class HorizontalPosition extends XmlComponent {
-    constructor(horizontalPosition: HorizontalPositionOptions) {
+    constructor(horizontalPosition: IHorizontalPositionOptions) {
         super("wp:positionH");
 
         this.root.push(
diff --git a/src/file/drawing/floating/position-offset.spec.ts b/src/file/drawing/floating/position-offset.spec.ts
index e0360c1716..74aebaebc2 100644
--- a/src/file/drawing/floating/position-offset.spec.ts
+++ b/src/file/drawing/floating/position-offset.spec.ts
@@ -1,7 +1,7 @@
 import { assert } from "chai";
 
-import { PositionOffset } from "./position-offset";
 import { Utility } from "../../../tests/utility";
+import { PositionOffset } from "./position-offset";
 
 describe("PositionOffset", () => {
     describe("#constructor()", () => {
diff --git a/src/file/drawing/floating/simple-pos.ts b/src/file/drawing/floating/simple-pos.ts
index b5e8df70d3..6330f6660a 100644
--- a/src/file/drawing/floating/simple-pos.ts
+++ b/src/file/drawing/floating/simple-pos.ts
@@ -1,5 +1,5 @@
 // http://officeopenxml.com/drwPicFloating-position.php
-import { XmlComponent, XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 
 interface ISimplePosAttributes {
     x: number;
diff --git a/src/file/drawing/floating/vertical-position.spec.ts b/src/file/drawing/floating/vertical-position.spec.ts
index 13e1ae2a4c..a9d7ed65f8 100644
--- a/src/file/drawing/floating/vertical-position.spec.ts
+++ b/src/file/drawing/floating/vertical-position.spec.ts
@@ -1,8 +1,8 @@
 import { assert } from "chai";
 
-import { VerticalPosition } from "./vertical-position";
+import { VerticalPositionAlign, VerticalPositionRelativeFrom } from ".";
 import { Utility } from "../../../tests/utility";
-import { VerticalPositionRelativeFrom, VerticalPositionAlign } from ".";
+import { VerticalPosition } from "./vertical-position";
 
 describe("VerticalPosition", () => {
     describe("#constructor()", () => {
diff --git a/src/file/drawing/floating/vertical-position.ts b/src/file/drawing/floating/vertical-position.ts
index 4c6826221d..10b6d6028f 100644
--- a/src/file/drawing/floating/vertical-position.ts
+++ b/src/file/drawing/floating/vertical-position.ts
@@ -1,7 +1,7 @@
 // http://officeopenxml.com/drwPicFloating-position.php
-import { XmlComponent, XmlAttributeComponent } from "file/xml-components";
-import { VerticalPositionRelativeFrom, VerticalPositionOptions } from "./floating-position";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
 import { Align } from "./align";
+import { IVerticalPositionOptions, VerticalPositionRelativeFrom } from "./floating-position";
 import { PositionOffset } from "./position-offset";
 
 interface IVerticalPositionAttributes {
@@ -15,7 +15,7 @@ class VerticalPositionAttributes extends XmlAttributeComponent<IVerticalPosition
 }
 
 export class VerticalPosition extends XmlComponent {
-    constructor(verticalPosition: VerticalPositionOptions) {
+    constructor(verticalPosition: IVerticalPositionOptions) {
         super("wp:positionV");
 
         this.root.push(
diff --git a/src/file/drawing/graphic/graphic-data/graphic-data-attribute.ts b/src/file/drawing/inline/graphic/graphic-data/graphic-data-attribute.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/graphic-data-attribute.ts
rename to src/file/drawing/inline/graphic/graphic-data/graphic-data-attribute.ts
diff --git a/src/file/drawing/graphic/graphic-data/graphic-data.ts b/src/file/drawing/inline/graphic/graphic-data/graphic-data.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/graphic-data.ts
rename to src/file/drawing/inline/graphic/graphic-data/graphic-data.ts
diff --git a/src/file/drawing/graphic/graphic-data/index.ts b/src/file/drawing/inline/graphic/graphic-data/index.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/index.ts
rename to src/file/drawing/inline/graphic/graphic-data/index.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/blip/blip-fill.ts b/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/blip/blip-fill.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/blip/blip.ts b/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/blip/blip.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/blip/source-rectangle.ts b/src/file/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/blip/source-rectangle.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/blip/stretch.ts b/src/file/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/blip/stretch.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/index.ts b/src/file/drawing/inline/graphic/graphic-data/pic/index.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/index.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/index.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/child-non-visual-pic-properties.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/child-non-visual-pic-properties.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/child-non-visual-pic-properties.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/child-non-visual-pic-properties.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks-attributes.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks-attributes.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks-attributes.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-pic-properties.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-pic-properties.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-pic-properties.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-pic-properties.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/pic-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/pic-attributes.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/pic-attributes.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/pic-attributes.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/pic.ts b/src/file/drawing/inline/graphic/graphic-data/pic/pic.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/pic.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/pic.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/shape-properties/form/extents/extents-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents-attributes.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/shape-properties/form/extents/extents-attributes.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents-attributes.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/shape-properties/form/extents/extents.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/shape-properties/form/extents/extents.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/shape-properties/form/form.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/form.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/shape-properties/form/form.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/form.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/shape-properties/form/index.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/index.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/shape-properties/form/index.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/index.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/shape-properties/form/offset/off-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off-attributes.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/shape-properties/form/offset/off-attributes.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off-attributes.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/shape-properties/form/offset/off.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/shape-properties/form/offset/off.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/shape-properties/no-fill.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/no-fill.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/shape-properties/no-fill.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/no-fill.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/shape-properties/outline/no-fill.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/shape-properties/outline/no-fill.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/shape-properties/outline/outline.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/shape-properties/outline/outline.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/shape-properties/preset-geometry/adjustment-values/adjustment-values.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/adjustment-values/adjustment-values.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/shape-properties/preset-geometry/adjustment-values/adjustment-values.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/adjustment-values/adjustment-values.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry-attributes.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry-attributes.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry-attributes.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/shape-properties/shape-properties-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties-attributes.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/shape-properties/shape-properties-attributes.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties-attributes.ts
diff --git a/src/file/drawing/graphic/graphic-data/pic/shape-properties/shape-properties.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties.ts
similarity index 100%
rename from src/file/drawing/graphic/graphic-data/pic/shape-properties/shape-properties.ts
rename to src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties.ts
diff --git a/src/file/drawing/graphic/index.ts b/src/file/drawing/inline/graphic/index.ts
similarity index 100%
rename from src/file/drawing/graphic/index.ts
rename to src/file/drawing/inline/graphic/index.ts
diff --git a/src/file/drawing/inline/inline-attributes.ts b/src/file/drawing/inline/inline-attributes.ts
index c177fd9ea7..5f7489188c 100644
--- a/src/file/drawing/inline/inline-attributes.ts
+++ b/src/file/drawing/inline/inline-attributes.ts
@@ -1,7 +1,8 @@
 import { XmlAttributeComponent } from "file/xml-components";
-import { Distance } from "../drawing";
+import { IDistance } from "../drawing";
 
-export interface IInlineAttributes extends Distance {}
+// tslint:disable-next-line:no-empty-interface
+export interface IInlineAttributes extends IDistance {}
 
 export class InlineAttributes extends XmlAttributeComponent<IInlineAttributes> {
     protected xmlKeys = {
diff --git a/src/file/drawing/inline/inline.ts b/src/file/drawing/inline/inline.ts
index a40aed25f2..6e5be2ba13 100644
--- a/src/file/drawing/inline/inline.ts
+++ b/src/file/drawing/inline/inline.ts
@@ -4,8 +4,8 @@ import { XmlComponent } from "file/xml-components";
 import { DocProperties } from "./../doc-properties/doc-properties";
 import { EffectExtent } from "./../effect-extent/effect-extent";
 import { Extent } from "./../extent/extent";
-import { Graphic } from "./../graphic";
 import { GraphicFrameProperties } from "./../graphic-frame/graphic-frame-properties";
+import { Graphic } from "./../inline/graphic";
 import { InlineAttributes } from "./inline-attributes";
 
 export class Inline extends XmlComponent {
diff --git a/src/file/drawing/text-wrap/text-wrapping.ts b/src/file/drawing/text-wrap/text-wrapping.ts
index 4894ca76da..7fc14a52fd 100644
--- a/src/file/drawing/text-wrap/text-wrapping.ts
+++ b/src/file/drawing/text-wrap/text-wrapping.ts
@@ -1,5 +1,5 @@
 // http://officeopenxml.com/drwPicFloating-textWrap.php
-import { Distance } from "../drawing";
+import { IDistance } from "../drawing";
 
 export enum TextWrapStyle {
     NONE,
@@ -15,8 +15,8 @@ export enum WrapTextOption {
     LARGEST = "largest",
 }
 
-export interface TextWrapping {
+export interface ITextWrapping {
     textWrapStyle: TextWrapStyle;
     wrapTextOption?: WrapTextOption;
-    distanceFromText?: Distance;
+    distanceFromText?: IDistance;
 }
diff --git a/src/file/drawing/text-wrap/wrap-square.ts b/src/file/drawing/text-wrap/wrap-square.ts
index 5f8b7aef57..08ed108209 100644
--- a/src/file/drawing/text-wrap/wrap-square.ts
+++ b/src/file/drawing/text-wrap/wrap-square.ts
@@ -1,9 +1,9 @@
 // http://officeopenxml.com/drwPicFloating-textWrap.php
-import { XmlComponent, XmlAttributeComponent } from "file/xml-components";
-import { TextWrapping, WrapTextOption } from ".";
-import { Distance } from "../drawing";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { ITextWrapping, WrapTextOption } from ".";
+import { IDistance } from "../drawing";
 
-interface IWrapSquareAttributes extends Distance {
+interface IWrapSquareAttributes extends IDistance {
     wrapText?: WrapTextOption;
 }
 
@@ -18,7 +18,7 @@ class WrapSquareAttributes extends XmlAttributeComponent<IWrapSquareAttributes>
 }
 
 export class WrapSquare extends XmlComponent {
-    constructor(textWrapping: TextWrapping) {
+    constructor(textWrapping: ITextWrapping) {
         super("wp:wrapSquare");
 
         this.root.push(
diff --git a/src/file/drawing/text-wrap/wrap-tight.ts b/src/file/drawing/text-wrap/wrap-tight.ts
index 0703ebaaff..cda9a20194 100644
--- a/src/file/drawing/text-wrap/wrap-tight.ts
+++ b/src/file/drawing/text-wrap/wrap-tight.ts
@@ -1,6 +1,6 @@
 // http://officeopenxml.com/drwPicFloating-textWrap.php
-import { XmlComponent, XmlAttributeComponent } from "file/xml-components";
-import { Distance } from "../drawing";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { IDistance } from "../drawing";
 
 interface IWrapTightAttributes {
     distT?: number;
@@ -15,7 +15,7 @@ class WrapTightAttributes extends XmlAttributeComponent<IWrapTightAttributes> {
 }
 
 export class WrapTight extends XmlComponent {
-    constructor(distanceFromText?: Distance) {
+    constructor(distanceFromText?: IDistance) {
         super("wp:wrapTight");
 
         distanceFromText = distanceFromText || {
diff --git a/src/file/drawing/text-wrap/wrap-top-and-bottom.ts b/src/file/drawing/text-wrap/wrap-top-and-bottom.ts
index a161058783..bf6a5c3cae 100644
--- a/src/file/drawing/text-wrap/wrap-top-and-bottom.ts
+++ b/src/file/drawing/text-wrap/wrap-top-and-bottom.ts
@@ -1,6 +1,6 @@
 // http://officeopenxml.com/drwPicFloating-textWrap.php
-import { XmlComponent, XmlAttributeComponent } from "file/xml-components";
-import { Distance } from "../drawing";
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { IDistance } from "../drawing";
 
 interface IWrapTopAndBottomAttributes {
     distT?: number;
@@ -15,7 +15,7 @@ class WrapTopAndBottomAttributes extends XmlAttributeComponent<IWrapTopAndBottom
 }
 
 export class WrapTopAndBottom extends XmlComponent {
-    constructor(distanceFromText?: Distance) {
+    constructor(distanceFromText?: IDistance) {
         super("wp:wrapTopAndBottom");
 
         distanceFromText = distanceFromText || {
diff --git a/src/file/footer-wrapper.ts b/src/file/footer-wrapper.ts
index 47d0f73928..eaf0b1c410 100644
--- a/src/file/footer-wrapper.ts
+++ b/src/file/footer-wrapper.ts
@@ -1,9 +1,9 @@
+import { XmlComponent } from "file/xml-components";
 import { Footer } from "./footer/footer";
 import { IMediaData, Media } from "./media";
 import { Paragraph } from "./paragraph";
 import { Relationships } from "./relationships";
 import { Table } from "./table";
-import { XmlComponent } from ".";
 
 export class FooterWrapper {
     private readonly footer: Footer;
@@ -36,7 +36,7 @@ export class FooterWrapper {
         this.footer.addDrawing(imageData);
     }
 
-    public addChildElement(childElement: XmlComponent | string) {
+    public addChildElement(childElement: XmlComponent | string): void {
         this.footer.addChildElement(childElement);
     }
 
diff --git a/src/file/header-wrapper.ts b/src/file/header-wrapper.ts
index 4fcf025efc..1d5cccd9cc 100644
--- a/src/file/header-wrapper.ts
+++ b/src/file/header-wrapper.ts
@@ -1,9 +1,9 @@
+import { XmlComponent } from "file/xml-components";
 import { Header } from "./header/header";
 import { IMediaData, Media } from "./media";
 import { Paragraph } from "./paragraph";
 import { Relationships } from "./relationships";
 import { Table } from "./table";
-import { XmlComponent } from ".";
 
 export class FirstPageHeaderWrapper {
     private readonly header: Header;
@@ -86,7 +86,7 @@ export class HeaderWrapper {
         this.header.addDrawing(imageData);
     }
 
-    public addChildElement(childElement: XmlComponent | string) {
+    public addChildElement(childElement: XmlComponent | string): void {
         this.header.addChildElement(childElement);
     }
 
diff --git a/src/file/paragraph/run/picture-run.ts b/src/file/paragraph/run/picture-run.ts
index 711aa36f05..6a07b3bd9e 100644
--- a/src/file/paragraph/run/picture-run.ts
+++ b/src/file/paragraph/run/picture-run.ts
@@ -1,12 +1,12 @@
 import { Drawing } from "../../drawing";
-import { DrawingOptions } from "../../drawing/drawing";
+import { IDrawingOptions } from "../../drawing/drawing";
 import { IMediaData } from "../../media/data";
 import { Run } from "../run";
 
 export class PictureRun extends Run {
     private drawing: Drawing;
 
-    constructor(imageData: IMediaData, drawingOptions?: DrawingOptions) {
+    constructor(imageData: IMediaData, drawingOptions?: IDrawingOptions) {
         super();
 
         if (imageData === undefined) {
diff --git a/src/file/styles/external-styles-factory.ts b/src/file/styles/external-styles-factory.ts
index 9757faf8d9..2ebd6323bd 100644
--- a/src/file/styles/external-styles-factory.ts
+++ b/src/file/styles/external-styles-factory.ts
@@ -1,6 +1,6 @@
-import { Styles } from "./";
 import * as fastXmlParser from "fast-xml-parser";
-import { ImportedXmlComponent, ImportedRootElementAttributes, parseOptions, convertToXmlComponent } from "./../../file/xml-components";
+import { convertToXmlComponent, ImportedRootElementAttributes, ImportedXmlComponent, parseOptions } from "file/xml-components";
+import { Styles } from "./";
 
 export class ExternalStylesFactory {
     /**
diff --git a/src/file/xml-components/imported-xml-component.ts b/src/file/xml-components/imported-xml-component.ts
index b4cefc053c..23c4137900 100644
--- a/src/file/xml-components/imported-xml-component.ts
+++ b/src/file/xml-components/imported-xml-component.ts
@@ -1,3 +1,4 @@
+/* tslint:disable */
 import { XmlComponent, IXmlableObject } from ".";
 import * as fastXmlParser from "fast-xml-parser";
 import { flatMap } from "lodash";