diff --git a/dist/index.d.ts b/dist/index.d.ts
index d8b7a4758..a3340e8f7 100644
--- a/dist/index.d.ts
+++ b/dist/index.d.ts
@@ -3,5 +3,5 @@ import * as _Fn from './types/functions';
 export declare const Fn: typeof _Fn;
 import * as _Refs from './types/refs';
 export declare const Refs: typeof _Refs;
-export * from './types/index';
+export * from './types';
 export default function cloudform(template: Template): any;
diff --git a/dist/index.js b/dist/index.js
index a73bd01fc..33fb9fa07 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -8,7 +8,7 @@ const _Fn = require("./types/functions");
 exports.Fn = _Fn;
 const _Refs = require("./types/refs");
 exports.Refs = _Refs;
-__export(require("./types/index"));
+__export(require("./types"));
 function cloudform(template) {
     return jsonStringify(template);
 }
diff --git a/dist/types/common.d.ts b/dist/types/common.d.ts
deleted file mode 100644
index a961118d4..000000000
--- a/dist/types/common.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export declare type DataType = 'String' | 'Number' | 'List<Number>' | 'CommaDelimitedList';
-export declare class DataTypes {
-    static String: DataType;
-    static Number: DataType;
-    static ListOfNumbers: DataType;
-    static CommaDelimitedList: DataType;
-}
diff --git a/dist/types/common.js b/dist/types/common.js
deleted file mode 100644
index 4439c3726..000000000
--- a/dist/types/common.js
+++ /dev/null
@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class DataTypes {
-}
-DataTypes.String = 'String';
-DataTypes.Number = 'Number';
-DataTypes.ListOfNumbers = 'List<Number>';
-DataTypes.CommaDelimitedList = 'CommaDelimitedList';
-exports.DataTypes = DataTypes;
diff --git a/dist/types/internal.d.ts b/dist/types/internal.d.ts
deleted file mode 100644
index 41cfd2f60..000000000
--- a/dist/types/internal.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import Parameter from "./parameter";
-import Resource from "./resource";
-export interface CloudformTemplate {
-    Description?: string;
-    Parameters?: {
-        [key: string]: Parameter;
-    };
-    Mappings?: {
-        [key: string]: {
-            [key: string]: {
-                [key: string]: string | number;
-            };
-        };
-    };
-    Resources?: {
-        [key: string]: Resource;
-    };
-}
-export declare class CFFunction {
-    private name;
-    private payload;
-    constructor(name: string, payload: any);
-    toJSON(): {
-        [x: string]: any;
-    };
-}
-export declare type Value<T> = T | CFFunction;
diff --git a/dist/types/internal.js b/dist/types/internal.js
deleted file mode 100644
index d5485b1ba..000000000
--- a/dist/types/internal.js
+++ /dev/null
@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class CFFunction {
-    constructor(name, payload) {
-        this.name = name;
-        this.payload = payload;
-    }
-    toJSON() {
-        return { [this.name]: this.payload };
-    }
-}
-exports.CFFunction = CFFunction;