diff --git a/pikaday/pikaday.d.ts b/pikaday/index.d.ts
similarity index 98%
rename from pikaday/pikaday.d.ts
rename to pikaday/index.d.ts
index 0025561f54..c476970617 100644
--- a/pikaday/pikaday.d.ts
+++ b/pikaday/index.d.ts
@@ -3,7 +3,11 @@
 // Definitions by: Rudolph Gottesheim <http://midnight-design.at/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../moment/moment.d.ts" />
+import * as moment from '../moment';
+
+export as namespace Pikaday;
+
+export = Pikaday;
 
 declare class Pikaday {
     el: HTMLElement;
@@ -282,6 +286,3 @@ declare namespace Pikaday {
     }
 }
 
-declare module "pikaday" {
-    export = Pikaday;
-}
diff --git a/pikaday/pikaday-tests.ts b/pikaday/pikaday-tests.ts
index f98d4afcee..b45e0c34ea 100644
--- a/pikaday/pikaday-tests.ts
+++ b/pikaday/pikaday-tests.ts
@@ -1,8 +1,7 @@
 /// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../moment/moment.d.ts" />
-/// <reference path="pikaday.d.ts" />
 
-import * as Pikaday from "pikaday";
+import * as Pikaday from "./";
+import * as moment from "../moment";
 
 new Pikaday({field: document.getElementById('datepicker')});
 new Pikaday({field: $('#datepicker')[0]});