Improve import alias

@file/ and @export/ instead of file/ and export/ etc

src/file/app-properties/app-properties-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class AppPropertiesAttributes extends XmlAttributeComponent<{
     readonly xmlns: string;

src/file/app-properties/app-properties.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { AppPropertiesAttributes } from "./app-properties-attributes";
 
 export class AppProperties extends XmlComponent {

src/file/border/border.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
-import { BorderStyle } from "file/border";
+import { Formatter } from "@export/formatter";
+import { BorderStyle } from "@file/border";
 
 import { BorderElement } from "./border";
 

src/file/border/border.ts

@@ -19,8 +19,8 @@
 //     <xsd:attribute name="shadow" type="s:ST_OnOff" use="optional"/>
 //     <xsd:attribute name="frame" type="s:ST_OnOff" use="optional"/>
 // </xsd:complexType>
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
-import { eighthPointMeasureValue, hexColorValue, pointMeasureValue } from "../values";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { eighthPointMeasureValue, hexColorValue, pointMeasureValue } from "@util/values";
 
 export interface IBorderOptions {
     readonly style: BorderStyle;

src/file/content-types/content-types-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class ContentTypeAttributes extends XmlAttributeComponent<{
     readonly xmlns?: string;

src/file/content-types/content-types.spec.ts

@@ -2,7 +2,7 @@
 
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 
 import { ContentTypes } from "./content-types";
 

src/file/content-types/content-types.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { ContentTypeAttributes } from "./content-types-attributes";
 import { Default } from "./default/default";
 import { Override } from "./override/override";

src/file/content-types/default/default-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class DefaultAttributes extends XmlAttributeComponent<{
     readonly contentType: string;

src/file/content-types/default/default.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { DefaultAttributes } from "./default-attributes";
 
 export class Default extends XmlComponent {

src/file/content-types/override/override-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class OverrideAttributes extends XmlAttributeComponent<{
     readonly contentType: string;

src/file/content-types/override/override.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { OverrideAttributes } from "./override-attributes";
 
 export class Override extends XmlComponent {

src/file/core-properties/properties.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 
 import { CoreProperties } from "./properties";
 

src/file/core-properties/properties.ts

@@ -1,5 +1,6 @@
-import { ICommentsOptions } from "file/paragraph/run/comment-run";
-import { StringContainer, XmlComponent } from "file/xml-components";
+import { ICommentsOptions } from "@file/paragraph/run/comment-run";
+import { StringContainer, XmlComponent } from "@file/xml-components";
+import { dateTimeValue } from "@util/values";
 
 import { ICustomPropertyOptions } from "../custom-properties";
 import { IDocumentBackgroundOptions } from "../document";
@@ -9,7 +10,6 @@ import { ISectionOptions } from "../file";
 import { INumberingOptions } from "../numbering";
 import { Paragraph } from "../paragraph";
 import { IStylesOptions } from "../styles";
-import { dateTimeValue } from "../values";
 
 export interface IPropertiesOptions {
     readonly sections: ISectionOptions[];

src/file/custom-properties/custom-properties-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class CustomPropertiesAttributes extends XmlAttributeComponent<{
     readonly xmlns: string;

src/file/custom-properties/custom-properties.spec.ts

@@ -1,5 +1,7 @@
 import { expect } from "chai";
-import { Formatter } from "export/formatter";
+
+import { Formatter } from "@export/formatter";
+
 import { CustomProperties } from "./custom-properties";
 
 describe("CustomProperties", () => {

src/file/custom-properties/custom-properties.ts

@@ -1,4 +1,4 @@
-import { IContext, IXmlableObject, XmlComponent } from "file/xml-components";
+import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components";
 import { CustomPropertiesAttributes } from "./custom-properties-attributes";
 import { CustomProperty, ICustomPropertyOptions } from "./custom-property";
 

src/file/custom-properties/custom-property-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class CustomPropertyAttributes extends XmlAttributeComponent<{
     readonly fmtid: string;

src/file/custom-properties/custom-property.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { CustomPropertyAttributes } from "./custom-property-attributes";
 
 export interface ICustomPropertyOptions {

src/file/document/body/body.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 
 import { Body } from "./body";
 import { sectionMarginDefaults } from "./section-properties";

src/file/document/body/body.ts

@@ -1,6 +1,6 @@
-import { IContext, IXmlableObject, XmlComponent } from "file/xml-components";
+import { Paragraph, ParagraphProperties } from "@file/paragraph";
+import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components";
 
-import { Paragraph, ParagraphProperties } from "../..";
 import { ISectionPropertiesOptions, SectionProperties } from "./section-properties/section-properties";
 
 export class Body extends XmlComponent {

src/file/document/body/section-properties/properties/column.ts

@@ -1,5 +1,5 @@
-import { twipsMeasureValue } from "file/values";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { twipsMeasureValue } from "@util/values";
 
 export interface IColumnAttributes {
     readonly width: number | string;

src/file/document/body/section-properties/properties/columns.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 
 import { Column, Columns } from ".";
 

src/file/document/body/section-properties/properties/columns.ts

@@ -1,5 +1,6 @@
-import { decimalNumber, twipsMeasureValue } from "file/values";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { decimalNumber, twipsMeasureValue } from "@util/values";
+
 import { Column } from "./column";
 
 // <xsd:complexType name="CT_Columns">

src/file/document/body/section-properties/properties/doc-grid.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 
 import { DocumentGrid, DocumentGridType } from ".";
 

src/file/document/body/section-properties/properties/doc-grid.ts

@@ -1,5 +1,5 @@
-import { decimalNumber } from "file/values";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { decimalNumber } from "@util/values";
 
 // not implemented
 // <xsd:simpleType name="ST_DocGrid">

src/file/document/body/section-properties/properties/header-footer-reference.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 import { HeaderFooterReference, HeaderFooterReferenceType, HeaderFooterType } from "./header-footer-reference";
 
 describe("HeaderFooterReference", () => {

src/file/document/body/section-properties/properties/header-footer-reference.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
 
 // <xsd:simpleType name="ST_HdrFtr">
 // <xsd:restriction base="xsd:string">

src/file/document/body/section-properties/properties/line-number.ts

@@ -1,6 +1,6 @@
 // http://officeopenxml.com/WPsectionLineNumbering.php
-import { decimalNumber, twipsMeasureValue } from "file/values";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { decimalNumber, twipsMeasureValue } from "@util/values";
 
 // <xsd:simpleType name="ST_LineNumberRestart">
 // <xsd:restriction base="xsd:string">

src/file/document/body/section-properties/properties/page-borders.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
-import { BorderStyle } from "file/border";
+import { Formatter } from "@export/formatter";
+import { BorderStyle } from "@file/border";
 
 import { PageBorderDisplay, PageBorders, PageBorderZOrder } from "./page-borders";
 

src/file/document/body/section-properties/properties/page-borders.ts

@@ -1,6 +1,6 @@
 // http://officeopenxml.com/WPsectionBorders.php
-import { BorderElement, IBorderOptions } from "file/border";
-import { IgnoreIfEmptyXmlComponent, XmlAttributeComponent } from "file/xml-components";
+import { BorderElement, IBorderOptions } from "@file/border";
+import { IgnoreIfEmptyXmlComponent, XmlAttributeComponent } from "@file/xml-components";
 
 // <xsd:simpleType name="ST_PageBorderDisplay">
 // <xsd:restriction base="xsd:string">

src/file/document/body/section-properties/properties/page-margin.ts

@@ -1,5 +1,5 @@
-import { signedTwipsMeasureValue, twipsMeasureValue } from "file/values";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { signedTwipsMeasureValue, twipsMeasureValue } from "@util/values";
 
 // <xsd:complexType name="CT_PageMar">
 //     <xsd:attribute name="top" type="ST_SignedTwipsMeasure" use="required"/>

src/file/document/body/section-properties/properties/page-number.ts

@@ -1,7 +1,7 @@
 // http://officeopenxml.com/WPSectionPgNumType.php
-import { NumberFormat } from "file/shared/number-format";
-import { decimalNumber } from "file/values";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { NumberFormat } from "@file/shared/number-format";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { decimalNumber } from "@util/values";
 
 // <xsd:simpleType name="ST_ChapterSep">
 // <xsd:restriction base="xsd:string">

src/file/document/body/section-properties/properties/page-size.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 
 import { PageOrientation, PageSize } from "./page-size";
 

src/file/document/body/section-properties/properties/page-size.ts

@@ -1,5 +1,5 @@
-import { twipsMeasureValue } from "file/values";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { twipsMeasureValue } from "@util/values";
 
 // <xsd:simpleType name="ST_PageOrientation">
 // <xsd:restriction base="xsd:string">

src/file/document/body/section-properties/properties/page-text-direction.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 import { PageTextDirection, PageTextDirectionType } from "./page-text-direction";
 
 describe("PageTextDirection", () => {

src/file/document/body/section-properties/properties/page-text-direction.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
 
 export enum PageTextDirectionType {
     LEFT_TO_RIGHT_TOP_TO_BOTTOM = "lrTb",

src/file/document/body/section-properties/properties/section-type.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 import { SectionType, Type } from "./section-type";
 
 describe("Type", () => {

src/file/document/body/section-properties/properties/section-type.ts

@@ -1,5 +1,5 @@
 // http://officeopenxml.com/WPsection.php
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
 
 // <xsd:simpleType name="ST_SectionMark">
 // <xsd:restriction base="xsd:string">

src/file/document/body/section-properties/section-properties.spec.ts

@@ -1,12 +1,12 @@
 import { expect } from "chai";
 
-import { convertInchesToTwip } from "convenience-functions";
-import { Formatter } from "export/formatter";
-import { FooterWrapper } from "file/footer-wrapper";
-import { HeaderWrapper } from "file/header-wrapper";
-import { Media } from "file/media";
-import { NumberFormat } from "file/shared/number-format";
-import { VerticalAlign } from "file/vertical-align";
+import { Formatter } from "@export/formatter";
+import { FooterWrapper } from "@file/footer-wrapper";
+import { HeaderWrapper } from "@file/header-wrapper";
+import { Media } from "@file/media";
+import { NumberFormat } from "@file/shared/number-format";
+import { VerticalAlign } from "@file/vertical-align";
+import { convertInchesToTwip } from "@util/convenience-functions";
 
 import { PageOrientation } from "./properties";
 import { DocumentGridType } from "./properties/doc-grid";

src/file/document/body/section-properties/section-properties.ts

@@ -1,10 +1,10 @@
 // http://officeopenxml.com/WPsection.php
 // tslint:disable: no-unnecessary-initializer
 
-import { FooterWrapper } from "file/footer-wrapper";
-import { HeaderWrapper } from "file/header-wrapper";
-import { VerticalAlign, VerticalAlignElement } from "file/vertical-align";
-import { OnOffElement, XmlComponent } from "file/xml-components";
+import { FooterWrapper } from "@file/footer-wrapper";
+import { HeaderWrapper } from "@file/header-wrapper";
+import { VerticalAlign, VerticalAlignElement } from "@file/vertical-align";
+import { OnOffElement, XmlComponent } from "@file/xml-components";
 
 import { HeaderFooterReference, HeaderFooterReferenceType, HeaderFooterType } from "./properties/header-footer-reference";
 

src/file/document/document-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export interface IDocumentAttributesProperties {
     readonly wpc?: string;

src/file/document/document-background/document-background.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 
 import { DocumentBackground } from "./document-background";
 

src/file/document/document-background/document-background.ts

@@ -1,7 +1,7 @@
 // http://officeopenxml.com/WPdocument.php
 // http://www.datypic.com/sc/ooxml/e-w_background-1.html
-import { hexColorValue, uCharHexNumber } from "file/values";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { hexColorValue, uCharHexNumber } from "@util/values";
 
 // <xsd:simpleType name="ST_ThemeColor">
 // <xsd:restriction base="xsd:string">

src/file/document/document.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 
 import { Document } from "./document";
 

src/file/document/document.ts

@@ -1,5 +1,5 @@
 // http://officeopenxml.com/WPdocument.php
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { ConcreteHyperlink, Paragraph } from "../paragraph";
 import { Table } from "../table";
 import { TableOfContents } from "../table-of-contents";

src/file/drawing/anchor/anchor-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 import { IDistance } from "../drawing";
 
 export interface IAnchorAttributes extends IDistance {

src/file/drawing/anchor/anchor.ts

@@ -1,6 +1,6 @@
 // http://officeopenxml.com/drwPicFloating.php
-import { IMediaData, IMediaDataTransformation } from "file/media";
-import { XmlComponent } from "file/xml-components";
+import { IMediaData, IMediaDataTransformation } from "@file/media";
+import { XmlComponent } from "@file/xml-components";
 import { IDrawingOptions } from "../drawing";
 import { HorizontalPosition, IFloating, SimplePos, VerticalPosition } from "../floating";
 import { Graphic } from "../inline/graphic";

src/file/drawing/doc-properties/doc-properties-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class DocPropertiesAttributes extends XmlAttributeComponent<{
     readonly id?: number;

src/file/drawing/doc-properties/doc-properties.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { DocPropertiesAttributes } from "./doc-properties-attributes";
 
 export class DocProperties extends XmlComponent {

src/file/drawing/drawing.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 
 import { Drawing, IDrawingOptions } from "./drawing";
 

src/file/drawing/drawing.ts

@@ -1,5 +1,5 @@
-import { IMediaData } from "file/media";
-import { XmlComponent } from "file/xml-components";
+import { IMediaData } from "@file/media";
+import { XmlComponent } from "@file/xml-components";
 import { Anchor } from "./anchor";
 import { IFloating } from "./floating";
 import { Inline } from "./inline";

src/file/drawing/effect-extent/effect-extent-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class EffectExtentAttributes extends XmlAttributeComponent<{
     readonly b?: number;

src/file/drawing/effect-extent/effect-extent.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { EffectExtentAttributes } from "./effect-extent-attributes";
 
 export class EffectExtent extends XmlComponent {

src/file/drawing/extent/extent-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class ExtentAttributes extends XmlAttributeComponent<{
     readonly cx?: number;

src/file/drawing/extent/extent.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 
 import { ExtentAttributes } from "./extent-attributes";
 

src/file/drawing/floating/align.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
-import { VerticalPositionAlign } from "file/shared/alignment";
+import { Formatter } from "@export/formatter";
+import { VerticalPositionAlign } from "@file/shared/alignment";
 
 import { Align } from "./align";
 

src/file/drawing/floating/align.ts

@@ -1,6 +1,6 @@
 // http://officeopenxml.com/drwPicFloating-position.php
-import { HorizontalPositionAlign, VerticalPositionAlign } from "file/shared/alignment";
-import { XmlComponent } from "file/xml-components";
+import { HorizontalPositionAlign, VerticalPositionAlign } from "@file/shared/alignment";
+import { XmlComponent } from "@file/xml-components";
 
 export class Align extends XmlComponent {
     constructor(value: HorizontalPositionAlign | VerticalPositionAlign) {

src/file/drawing/floating/floating-position.ts

@@ -1,6 +1,6 @@
 // http://officeopenxml.com/drwPicFloating-position.php
 // http://officeopenxml.com/drwPicFloating.php
-import { HorizontalPositionAlign, VerticalPositionAlign } from "file/shared/alignment";
+import { HorizontalPositionAlign, VerticalPositionAlign } from "@file/shared/alignment";
 
 import { ITextWrapping } from "../text-wrap";
 

src/file/drawing/floating/horizontal-position.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
-import { HorizontalPositionAlign } from "file/shared/alignment";
+import { Formatter } from "@export/formatter";
+import { HorizontalPositionAlign } from "@file/shared/alignment";
 
 import { HorizontalPositionRelativeFrom } from "./floating-position";
 import { HorizontalPosition } from "./horizontal-position";

src/file/drawing/floating/horizontal-position.ts

@@ -1,5 +1,5 @@
 // http://officeopenxml.com/drwPicFloating-position.php
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
 import { Align } from "./align";
 import { HorizontalPositionRelativeFrom, IHorizontalPositionOptions } from "./floating-position";
 import { PositionOffset } from "./position-offset";

src/file/drawing/floating/position-offset.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 
 import { PositionOffset } from "./position-offset";
 

src/file/drawing/floating/position-offset.ts

@@ -1,5 +1,5 @@
 // http://officeopenxml.com/drwPicFloating-position.php
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 
 export class PositionOffset extends XmlComponent {
     constructor(offsetValue: number) {

src/file/drawing/floating/simple-pos.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 
 import { SimplePos } from "./simple-pos";
 

src/file/drawing/floating/simple-pos.ts

@@ -1,5 +1,5 @@
 // http://officeopenxml.com/drwPicFloating-position.php
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
 
 class SimplePosAttributes extends XmlAttributeComponent<{
     readonly x: number;

src/file/drawing/floating/vertical-position.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
-import { VerticalPositionAlign } from "file/shared/alignment";
+import { Formatter } from "@export/formatter";
+import { VerticalPositionAlign } from "@file/shared/alignment";
 
 import { VerticalPositionRelativeFrom } from "./floating-position";
 import { VerticalPosition } from "./vertical-position";

src/file/drawing/floating/vertical-position.ts

@@ -1,5 +1,5 @@
 // http://officeopenxml.com/drwPicFloating-position.php
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
 import { Align } from "./align";
 import { IVerticalPositionOptions, VerticalPositionRelativeFrom } from "./floating-position";
 import { PositionOffset } from "./position-offset";

src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-lock-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class GraphicFrameLockAttributes extends XmlAttributeComponent<{
     readonly xmlns?: string;

src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-locks.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { GraphicFrameLockAttributes } from "./graphic-frame-lock-attributes";
 
 export class GraphicFrameLocks extends XmlComponent {

src/file/drawing/graphic-frame/graphic-frame-properties.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { GraphicFrameLocks } from "./graphic-frame-locks/graphic-frame-locks";
 
 export class GraphicFrameProperties extends XmlComponent {

src/file/drawing/inline/graphic/graphic-data/graphic-data-attribute.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class GraphicDataAttributes extends XmlAttributeComponent<{
     readonly uri?: string;

src/file/drawing/inline/graphic/graphic-data/graphic-data.ts

@@ -1,5 +1,5 @@
-import { IMediaData, IMediaDataTransformation } from "file/media";
-import { XmlComponent } from "file/xml-components";
+import { IMediaData, IMediaDataTransformation } from "@file/media";
+import { XmlComponent } from "@file/xml-components";
 
 import { GraphicDataAttributes } from "./graphic-data-attribute";
 import { Pic } from "./pic";

src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts

@@ -1,5 +1,5 @@
-import { IMediaData } from "file/media";
-import { XmlComponent } from "file/xml-components";
+import { IMediaData } from "@file/media";
+import { XmlComponent } from "@file/xml-components";
 
 import { Blip } from "./blip";
 import { SourceRectangle } from "./source-rectangle";

src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts

@@ -1,5 +1,5 @@
-import { IMediaData } from "file/media";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { IMediaData } from "@file/media";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
 
 class BlipAttributes extends XmlAttributeComponent<{
     readonly embed: string;

src/file/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 
 export class SourceRectangle extends XmlComponent {
     constructor() {

src/file/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 
 class FillRectangle extends XmlComponent {
     constructor() {

src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/child-non-visual-pic-properties.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { PicLocks } from "./pic-locks/pic-locks";
 
 export class ChildNonVisualProperties extends XmlComponent {

src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class PicLocksAttributes extends XmlAttributeComponent<{
     readonly noChangeAspect?: number;

src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { PicLocksAttributes } from "./pic-locks-attributes";
 
 export class PicLocks extends XmlComponent {

src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-pic-properties.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { ChildNonVisualProperties } from "./child-non-visual-pic-properties/child-non-visual-pic-properties";
 import { NonVisualProperties } from "./non-visual-properties/non-visual-properties";
 

src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class NonVisualPropertiesAttributes extends XmlAttributeComponent<{
     readonly id?: number;

src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { NonVisualPropertiesAttributes } from "./non-visual-properties-attributes";
 
 export class NonVisualProperties extends XmlComponent {

src/file/drawing/inline/graphic/graphic-data/pic/pic-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class PicAttributes extends XmlAttributeComponent<{
     readonly xmlns?: string;

src/file/drawing/inline/graphic/graphic-data/pic/pic.ts

@@ -1,6 +1,6 @@
 // http://officeopenxml.com/drwPic.php
-import { IMediaData, IMediaDataTransformation } from "file/media";
-import { XmlComponent } from "file/xml-components";
+import { IMediaData, IMediaDataTransformation } from "@file/media";
+import { XmlComponent } from "@file/xml-components";
 
 import { BlipFill } from "./blip/blip-fill";
 import { NonVisualPicProperties } from "./non-visual-pic-properties/non-visual-pic-properties";

src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 import { Form } from "./form/form";
 
 describe("Form", () => {

src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class ExtentsAttributes extends XmlAttributeComponent<{
     readonly cx?: number;

src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents.ts

@@ -1,5 +1,5 @@
 // http://officeopenxml.com/drwSp-size.php
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { ExtentsAttributes } from "./extents-attributes";
 
 export class Extents extends XmlComponent {

src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/form.ts

@@ -1,7 +1,7 @@
 // http://officeopenxml.com/drwSp-size.php
 // http://officeopenxml.com/drwSp-rotate.php
-import { IMediaDataTransformation } from "file/media";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { IMediaDataTransformation } from "@file/media";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
 
 import { Extents } from "./extents/extents";
 import { Offset } from "./offset/off";

src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class OffsetAttributes extends XmlAttributeComponent<{
     readonly x?: number;

src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off.ts

@@ -1,5 +1,5 @@
 // http://officeopenxml.com/drwSp-size.php
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { OffsetAttributes } from "./off-attributes";
 
 export class Offset extends XmlComponent {

src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 
 import { NoFill } from "./no-fill";
 

src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 
 export class NoFill extends XmlComponent {
     constructor() {

src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 import { Outline } from "./outline";
 
 describe("Outline", () => {

src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.ts

@@ -1,5 +1,5 @@
 // http://officeopenxml.com/drwSp-outline.php
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { NoFill } from "./no-fill";
 
 export class Outline extends XmlComponent {

src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/adjustment-values/adjustment-values.ts

@@ -1,5 +1,5 @@
 // http://officeopenxml.com/drwSp-prstGeom.php
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 
 export class AdjustmentValues extends XmlComponent {
     constructor() {

src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class PresetGeometryAttributes extends XmlAttributeComponent<{
     readonly prst?: string;

src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry.ts

@@ -1,5 +1,5 @@
 // http://officeopenxml.com/drwSp-prstGeom.php
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { AdjustmentValues } from "./adjustment-values/adjustment-values";
 import { PresetGeometryAttributes } from "./preset-geometry-attributes";
 

src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
 export class ShapePropertiesAttributes extends XmlAttributeComponent<{
     readonly bwMode?: string;

src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties.ts

@@ -1,6 +1,6 @@
 // http://officeopenxml.com/drwSp-SpPr.php
-import { IMediaDataTransformation } from "file/media";
-import { XmlComponent } from "file/xml-components";
+import { IMediaDataTransformation } from "@file/media";
+import { XmlComponent } from "@file/xml-components";
 import { Form } from "./form";
 // import { NoFill } from "./no-fill";
 // import { Outline } from "./outline/outline";

src/file/drawing/inline/graphic/graphic.ts

@@ -1,5 +1,5 @@
-import { IMediaData, IMediaDataTransformation } from "file/media";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { IMediaData, IMediaDataTransformation } from "@file/media";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
 
 import { GraphicData } from "./graphic-data";
 

src/file/drawing/inline/inline-attributes.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 import { IDistance } from "../drawing";
 
 // distT, distB etc have no effect on inline images, only floating