diff --git a/angular-cookie/angular-cookie-tests.ts b/angular-cookie/angular-cookie-tests.ts
index ba6b30d2ee..5974eb35d4 100644
--- a/angular-cookie/angular-cookie-tests.ts
+++ b/angular-cookie/angular-cookie-tests.ts
@@ -1,4 +1,3 @@
-
 /// <reference path='angular-cookie.d.ts' />
 
 angular.module('myApp', ['ipCookie'])
diff --git a/angular-cookie/angular-cookie.d.ts b/angular-cookie/angular-cookie.d.ts
index 02700ea1bd..994058abdd 100644
--- a/angular-cookie/angular-cookie.d.ts
+++ b/angular-cookie/angular-cookie.d.ts
@@ -3,6 +3,8 @@
 // Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference path="../angularjs/angularjs.d.ts" />
+
 declare namespace angular.cookie {
     interface CookieService {
         /**
diff --git a/angular-local-storage/angular-local-storage.d.ts b/angular-local-storage/angular-local-storage.d.ts
index 00694fea00..f7c311c2a4 100644
--- a/angular-local-storage/angular-local-storage.d.ts
+++ b/angular-local-storage/angular-local-storage.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Ken Fukuyama <https://github.com/kenfdev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference path="../angularjs/angularjs.d.ts" />
 
 declare namespace angular.local.storage {
   interface ILocalStorageServiceProvider extends angular.IServiceProvider {
diff --git a/angular-signalr-hub/angular-signalr-hub.d.ts b/angular-signalr-hub/angular-signalr-hub.d.ts
index 03fa6427eb..a6a26a76c7 100644
--- a/angular-signalr-hub/angular-signalr-hub.d.ts
+++ b/angular-signalr-hub/angular-signalr-hub.d.ts
@@ -4,6 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path='../signalr/signalr.d.ts' />
+/// <reference path='../angularjs/angularjs.d.ts' />
 
 declare namespace ngSignalr {
     interface HubFactory {
diff --git a/angular-storage/angular-storage-tests.ts b/angular-storage/angular-storage-tests.ts
index 2854f85246..51a2cd914b 100644
--- a/angular-storage/angular-storage-tests.ts
+++ b/angular-storage/angular-storage-tests.ts
@@ -1,4 +1,3 @@
-
 /// <reference path='angular-storage.d.ts' />
 
 // Samples taken from the a0-angular-storage Readme.md
diff --git a/angular-storage/angular-storage.d.ts b/angular-storage/angular-storage.d.ts
index cb46cd1d7c..c8ac0bef73 100644
--- a/angular-storage/angular-storage.d.ts
+++ b/angular-storage/angular-storage.d.ts
@@ -3,6 +3,8 @@
 // Definitions by: Matthew DeKrey <https://github.com/mdekrey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference path="../angularjs/angularjs.d.ts" />
+
 declare namespace angular.a0.storage {
 	interface IStoreService extends INamespacedStoreService {
 		/**
diff --git a/angular-touchspin/angular-touchspin-tests.ts b/angular-touchspin/angular-touchspin-tests.ts
index 058fe930c8..c431a4f6e4 100644
--- a/angular-touchspin/angular-touchspin-tests.ts
+++ b/angular-touchspin/angular-touchspin-tests.ts
@@ -1,5 +1,4 @@
-
-/// <reference path='angular-touchspin.d.ts' />
+/// <reference path="angular-touchspin.d.ts" />
 
 angular
     .module('touchspin-tests', ['lm.touchspin'])
diff --git a/angular-touchspin/angular-touchspin.d.ts b/angular-touchspin/angular-touchspin.d.ts
index 77add90d24..5f66244394 100644
--- a/angular-touchspin/angular-touchspin.d.ts
+++ b/angular-touchspin/angular-touchspin.d.ts
@@ -3,8 +3,7 @@
 // Definitions by: Niko Kovačič <https://github.com/nkovacic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-//// <reference path="../angularjs/angularjs.d.ts" />
-
+/// <reference path="../angularjs/angularjs.d.ts" />
 
 declare module "angular-touchspin" {
     let _: string;
diff --git a/angular-ui-tree/angular-ui-tree.d.ts b/angular-ui-tree/angular-ui-tree.d.ts
index 43df4f81a8..2d7f14baa0 100644
--- a/angular-ui-tree/angular-ui-tree.d.ts
+++ b/angular-ui-tree/angular-ui-tree.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Calvin Fernandez <https://github.com/CalvinFernandez>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference path="../angularjs/angularjs.d.ts" />
 
 declare namespace AngularUITree {
     interface IEventSourceInfo {
diff --git a/basic-auth/index.d.ts b/basic-auth/index.d.ts
index a40e13f3e2..3dc19b3046 100644
--- a/basic-auth/index.d.ts
+++ b/basic-auth/index.d.ts
@@ -3,8 +3,7 @@
 // Definitions by: Clément Bourgeois <https://github.com/moonpyk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
+import * as Express from 'express';
 
 declare function auth(req: Express.Request): auth.BasicAuthResult;
 
diff --git a/change-case/change-case-tests.ts b/change-case/change-case-tests.ts
index 2e80c8a0d9..67ef86405b 100644
--- a/change-case/change-case-tests.ts
+++ b/change-case/change-case-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="change-case.d.ts"/>
-
 import changeCase = require("change-case");
 
 var s: string;
diff --git a/change-case/change-case.d.ts b/change-case/change-case.d.ts
deleted file mode 100644
index 80ba8e3bec..0000000000
--- a/change-case/change-case.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for change-case
-// Project: https://github.com/blakeembrey/change-case
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-declare function dot(s: string): string;
-declare function dotCase(s: string): string;
-declare function swap(s: string): string;
-declare function swapCase(s: string): string;
-declare function path(s: string): string;
-declare function pathCase(s: string): string;
-declare function upper(s: string): string;
-declare function upperCase(s: string): string;
-declare function lower(s: string): string;
-declare function lowerCase(s: string): string;
-declare function camel(s: string): string;
-declare function camelCase(s: string): string;
-declare function snake(s: string): string;
-declare function snakeCase(s: string): string;
-declare function title(s: string): string;
-declare function titleCase(s: string): string;
-declare function param(s: string): string;
-declare function paramCase(s: string): string;
-declare function pascal(s: string): string;
-declare function pascalCase(s: string): string;
-declare function constant(s: string): string;
-declare function constantCase(s: string): string;
-declare function sentence(s: string): string;
-declare function sentenceCase(s: string): string;
-declare function isUpper(s: string): boolean;
-declare function isUpperCase(s: string): boolean;
-declare function isLower(s: string): boolean;
-declare function isLowerCase(s: string): boolean;
-declare function ucFirst(s: string): string;
-declare function upperCaseFirst(s: string): string;
-declare function lcFirst(s: string): string;
-declare function lowerCaseFirst(s: string): string;
diff --git a/change-case/index.d.ts b/change-case/index.d.ts
new file mode 100644
index 0000000000..590597d621
--- /dev/null
+++ b/change-case/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for change-case
+// Project: https://github.com/blakeembrey/change-case
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function dot(s: string): string;
+export function dotCase(s: string): string;
+export function swap(s: string): string;
+export function swapCase(s: string): string;
+export function path(s: string): string;
+export function pathCase(s: string): string;
+export function upper(s: string): string;
+export function upperCase(s: string): string;
+export function lower(s: string): string;
+export function lowerCase(s: string): string;
+export function camel(s: string): string;
+export function camelCase(s: string): string;
+export function snake(s: string): string;
+export function snakeCase(s: string): string;
+export function title(s: string): string;
+export function titleCase(s: string): string;
+export function param(s: string): string;
+export function paramCase(s: string): string;
+export function pascal(s: string): string;
+export function pascalCase(s: string): string;
+export function constant(s: string): string;
+export function constantCase(s: string): string;
+export function sentence(s: string): string;
+export function sentenceCase(s: string): string;
+export function isUpper(s: string): boolean;
+export function isUpperCase(s: string): boolean;
+export function isLower(s: string): boolean;
+export function isLowerCase(s: string): boolean;
+export function ucFirst(s: string): string;
+export function upperCaseFirst(s: string): string;
+export function lcFirst(s: string): string;
+export function lowerCaseFirst(s: string): string;
diff --git a/cldrjs/cldr.js-supplemental-tests.ts b/cldrjs/cldr.js-supplemental-tests.ts
index 5827337973..aa861d4678 100644
--- a/cldrjs/cldr.js-supplemental-tests.ts
+++ b/cldrjs/cldr.js-supplemental-tests.ts
@@ -1,7 +1,7 @@
 /// <reference path="cldr.js.d.ts" />
 /// <reference path="cldr.js-supplemental.d.ts" />
 
-const cldr = new Cldr("en");
+const myCldr = new Cldr("en");
 
 const supplemental = cldr.supplemental;
 
diff --git a/cldrjs/cldr.js-tests.ts b/cldrjs/cldr.js-tests.ts
index c86d487741..386a59b9af 100644
--- a/cldrjs/cldr.js-tests.ts
+++ b/cldrjs/cldr.js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="cldr.js.d.ts" />
+/// <reference path="index.d.ts" />
 
 Cldr.load({
     "main": {
diff --git a/cldrjs/cldr.js.d.ts b/cldrjs/index.d.ts
similarity index 98%
rename from cldrjs/cldr.js.d.ts
rename to cldrjs/index.d.ts
index 04ecb428f6..75751bd5b5 100644
--- a/cldrjs/cldr.js.d.ts
+++ b/cldrjs/index.d.ts
@@ -3,6 +3,11 @@
 // Definitions by: Raman But-Husaim <https://github.com/RamanBut-Husaim>, Grégoire Castre <https://github.com/gcastre/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+export = self;
+export as namespace Cldr;
+
+declare var self: cldr.CldrFactory;
+
 declare namespace cldr {
     /**
      * @name Attributes
@@ -251,9 +256,3 @@ declare namespace cldr {
         localeSep: "-" | "_";
     }
 }
-
-declare module "cldr" {
-    export = cldr;
-}
-
-declare var Cldr: cldr.CldrFactory;
diff --git a/cldrjs/tsconfig.json b/cldrjs/tsconfig.json
index effc71d799..3bb57178a5 100644
--- a/cldrjs/tsconfig.json
+++ b/cldrjs/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"files": ["index.d.ts", "cldr.js-tests.ts"],
     "compilerOptions": {
         "module": "commonjs",
         "target": "es6",