diff --git a/geometry/geometry-tests.ts b/geometry-dom/geometry-dom-tests.ts
similarity index 93%
rename from geometry/geometry-tests.ts
rename to geometry-dom/geometry-dom-tests.ts
index 6e05d380a8..e293665112 100644
--- a/geometry/geometry-tests.ts
+++ b/geometry-dom/geometry-dom-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./geometry.d.ts" />
+/// <reference path="./geometry-dom.d.ts" />
 
 var point = new DOMPoint(5, 4);
 var matrix = new DOMMatrix(2, 0, 0, 2, 10, 10);
diff --git a/geometry/geometry.d.ts b/geometry-dom/geometry-dom.d.ts
similarity index 88%
rename from geometry/geometry.d.ts
rename to geometry-dom/geometry-dom.d.ts
index f0a8c3ba5b..9058bf87d1 100644
--- a/geometry/geometry.d.ts
+++ b/geometry-dom/geometry-dom.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Toshiya Nakakura <https://github.com/nakakura>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-declare module Geometry {
+declare module GeometryDom {
     export interface DOMPointReadOnly {
         /**
          * x coordinate / readonly
@@ -234,13 +234,13 @@ declare module Geometry {
 }
 
 declare var DOMPointReadOnly: {
-    prototype: Geometry.DOMPointReadOnly;
-    new (x: number, y: number, z: number, w: number): Geometry.DOMPointReadOnly;
+    prototype: GeometryDom.DOMPointReadOnly;
+    new (x: number, y: number, z: number, w: number): GeometryDom.DOMPointReadOnly;
 };
 
 declare var DOMPoint: {
-    prototype: Geometry.DOMPoint;
-    new (x?:number, y?:number, z?:number, w?:number): Geometry.DOMPoint;
+    prototype: GeometryDom.DOMPoint;
+    new (x?:number, y?:number, z?:number, w?:number): GeometryDom.DOMPoint;
 };
 
 interface DOMPointInit {
@@ -263,13 +263,13 @@ interface DOMPointInit {
 }
 
 declare var DOMRect: {
-    prototype: Geometry.DOMRect;
-    new (x: number, y: number, width: number, height: number): Geometry.DOMRect;
+    prototype: GeometryDom.DOMRect;
+    new (x: number, y: number, width: number, height: number): GeometryDom.DOMRect;
 };
 
 declare var DOMRectReadOnly: {
-    prototype: Geometry.DOMRectReadOnly;
-    new (x: number, y: number, width: number, height: number): Geometry.DOMRectReadOnly;
+    prototype: GeometryDom.DOMRectReadOnly;
+    new (x: number, y: number, width: number, height: number): GeometryDom.DOMRectReadOnly;
 };
 
 interface DOMRectInit {
@@ -301,26 +301,26 @@ interface DOMRectList {
      * the DOMRect object at index must be returned.
      * @param index
      */
-    item(index: number): Geometry.DOMRect;
+    item(index: number): GeometryDom.DOMRect;
 }
 
 declare var DOMQuad: {
-    prototype: Geometry.DOMQuad;
-    new (rect?: DOMRectInit): Geometry.DOMQuad;
-    new (p1?: DOMPointInit, p2?: DOMPointInit, p3?: DOMPointInit, p4?: DOMPointInit): Geometry.DOMQuad;
+    prototype: GeometryDom.DOMQuad;
+    new (rect?: DOMRectInit): GeometryDom.DOMQuad;
+    new (p1?: DOMPointInit, p2?: DOMPointInit, p3?: DOMPointInit, p4?: DOMPointInit): GeometryDom.DOMQuad;
 };
 
 declare var DOMMatrixReadOnly: {
-    prototype: Geometry.DOMMatrixReadOnly;
-    new (numberSequence: Array<number>): Geometry.DOMMatrixReadOnly;
+    prototype: GeometryDom.DOMMatrixReadOnly;
+    new (numberSequence: Array<number>): GeometryDom.DOMMatrixReadOnly;
 };
 
 declare var DOMMatrix: {
-    prototype: Geometry.DOMMatrix;
-    new (): Geometry.DOMMatrix;
-    new (transformList: string): Geometry.DOMMatrix;
-    new (other: Geometry.DOMMatrixReadOnly): Geometry.DOMMatrix;
-    new (array: Array<number>): Geometry.DOMMatrix;
-    new (a: number, b: number, c: number, d: number, e: number, f: number): Geometry.DOMMatrix;
+    prototype: GeometryDom.DOMMatrix;
+    new (): GeometryDom.DOMMatrix;
+    new (transformList: string): GeometryDom.DOMMatrix;
+    new (other: GeometryDom.DOMMatrixReadOnly): GeometryDom.DOMMatrix;
+    new (array: Array<number>): GeometryDom.DOMMatrix;
+    new (a: number, b: number, c: number, d: number, e: number, f: number): GeometryDom.DOMMatrix;
 };
 
diff --git a/npm-debug.log b/npm-debug.log
deleted file mode 100644
index 080c94e868..0000000000
--- a/npm-debug.log
+++ /dev/null
@@ -1,36 +0,0 @@
-0 info it worked if it ends with ok
-1 verbose cli [ 'node', '/usr/local/bin/npm', 'run', 'all' ]
-2 info using npm@2.7.5
-3 info using node@v0.12.2
-4 verbose node symlink /usr/local/bin/node
-5 verbose run-script [ 'preall', 'all', 'postall' ]
-6 info preall DefinitelyTyped@0.0.1
-7 info all DefinitelyTyped@0.0.1
-8 verbose unsafe-perm in lifecycle true
-9 info DefinitelyTyped@0.0.1 Failed to exec all script
-10 verbose stack Error: DefinitelyTyped@0.0.1 all: `dt`
-10 verbose stack Exit status 1
-10 verbose stack     at EventEmitter.<anonymous> (/usr/local/lib/node_modules/npm/lib/utils/lifecycle.js:213:16)
-10 verbose stack     at EventEmitter.emit (events.js:110:17)
-10 verbose stack     at ChildProcess.<anonymous> (/usr/local/lib/node_modules/npm/lib/utils/spawn.js:14:12)
-10 verbose stack     at ChildProcess.emit (events.js:110:17)
-10 verbose stack     at maybeClose (child_process.js:1015:16)
-10 verbose stack     at Process.ChildProcess._handle.onexit (child_process.js:1087:5)
-11 verbose pkgid DefinitelyTyped@0.0.1
-12 verbose cwd /Volumes/user/Users/nakakura/Desktop/DefinitelyTyped
-13 error Darwin 14.3.0
-14 error argv "node" "/usr/local/bin/npm" "run" "all"
-15 error node v0.12.2
-16 error npm  v2.7.5
-17 error code ELIFECYCLE
-18 error DefinitelyTyped@0.0.1 all: `dt`
-18 error Exit status 1
-19 error Failed at the DefinitelyTyped@0.0.1 all script 'dt'.
-19 error This is most likely a problem with the DefinitelyTyped package,
-19 error not with npm itself.
-19 error Tell the author that this fails on your system:
-19 error     dt
-19 error You can get their info via:
-19 error     npm owner ls DefinitelyTyped
-19 error There is likely additional logging output above.
-20 verbose exit [ 1, true ]