diff --git a/xrm/xrm-6.d.ts b/xrm/v6/index.d.ts
similarity index 100%
rename from xrm/xrm-6.d.ts
rename to xrm/v6/index.d.ts
diff --git a/xrm/v6/tsconfig.json b/xrm/v6/tsconfig.json
new file mode 100644
index 0000000000..220693faf6
--- /dev/null
+++ b/xrm/v6/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "files": [
+        "index.d.ts",
+        "xrm-v6-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file
diff --git a/xrm/xrm-6.tests.ts b/xrm/v6/xrm-v6-tests.ts
similarity index 95%
rename from xrm/xrm-6.tests.ts
rename to xrm/v6/xrm-v6-tests.ts
index 3b911da94d..6cdb61a33c 100644
--- a/xrm/xrm-6.tests.ts
+++ b/xrm/v6/xrm-v6-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="index.d.ts" />
+/// <reference path="../parature.d.ts" />
 
 
 function _getContext()
diff --git a/xrm/xrm-7.1.d.ts b/xrm/v7.1/index.d.ts
similarity index 100%
rename from xrm/xrm-7.1.d.ts
rename to xrm/v7.1/index.d.ts
diff --git a/xrm/v7.1/tsconfig.json b/xrm/v7.1/tsconfig.json
new file mode 100644
index 0000000000..ab52c3f626
--- /dev/null
+++ b/xrm/v7.1/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "files": [
+        "index.d.ts",
+        "xrm-v7.1-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file
diff --git a/xrm/xrm-7.1.tests.ts b/xrm/v7.1/xrm-v7.1-tests.ts
similarity index 97%
rename from xrm/xrm-7.1.tests.ts
rename to xrm/v7.1/xrm-v7.1-tests.ts
index f3f4576b02..e962910a96 100644
--- a/xrm/xrm-7.1.tests.ts
+++ b/xrm/v7.1/xrm-v7.1-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="xrm.d.ts" />
-/// <reference path="parature.d.ts" />
+/// <reference path="index.d.ts" />
+/// <reference path="../parature.d.ts" />
 
 /// Demonstrate usage in the browser's window object
 
@@ -41,7 +41,7 @@ grids.forEach(( gridControl: Xrm.Page.GridControl ) =>
     gridControl.getGrid().getSelectedRows().forEach(( row ) =>
     {
         selectedGridReferences.push( row.getData().getEntity().getEntityReference() );
-    })
+    });
 });
 
 /// Demonstrate generic overload vs typecast
diff --git a/xrm/xrm-7.0.d.ts b/xrm/v7/index.d.ts
similarity index 100%
rename from xrm/xrm-7.0.d.ts
rename to xrm/v7/index.d.ts
diff --git a/xrm/v7/tsconfig.json b/xrm/v7/tsconfig.json
new file mode 100644
index 0000000000..0e2582bf02
--- /dev/null
+++ b/xrm/v7/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "files": [
+        "index.d.ts",
+        "xrm-v7.0-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file
diff --git a/xrm/xrm-7.0.tests.ts b/xrm/v7/xrm-v7-tests.ts
similarity index 96%
rename from xrm/xrm-7.0.tests.ts
rename to xrm/v7/xrm-v7-tests.ts
index f45f49c20c..17ae2a3d9a 100644
--- a/xrm/xrm-7.0.tests.ts
+++ b/xrm/v7/xrm-v7-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="index.d.ts" />
+/// <reference path="../parature.d.ts" />
 
 
 function _getContext()
diff --git a/xrm/xrm-tests.ts b/xrm/xrm-tests.ts
index 65ae6e0184..1893b9b89a 100644
--- a/xrm/xrm-tests.ts
+++ b/xrm/xrm-tests.ts
@@ -38,10 +38,9 @@ var selectedGridReferences: Xrm.Page.LookupValue[] = [];
 
 grids.forEach(( gridControl: Xrm.Page.GridControl ) =>
 {
-    gridControl.getGrid().getSelectedRows().forEach(( row ) =>
-    {
-        selectedGridReferences.push( row.getData().getEntity().getEntityReference() );
-    })
+    gridControl.getGrid().getSelectedRows().forEach((row) => {
+        selectedGridReferences.push(row.getData().getEntity().getEntityReference());
+    });
 });
 
 /// Demonstrate generic overload vs typecast