diff --git a/knockout.rx/knockout.rx.d.ts b/knockout.rx/knockout.rx.d.ts
index 4a27f3fed..7b98e25c2 100644
--- a/knockout.rx/knockout.rx.d.ts
+++ b/knockout.rx/knockout.rx.d.ts
@@ -4,6 +4,7 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../knockout/knockout.d.ts"/>
+/// <reference path="../rx/rx.d.ts"/>
 
 interface KnockoutSubscribableFunctions<T> {
 	toObservable(event?: string): Rx.Observable<T>;
@@ -20,8 +21,6 @@ interface KnockoutComputedFunctions<T> {
 }
 
 declare module Rx {
-	interface ISubject<T> { }
-
 	interface Observable<T> {
 		toKoSubscribable(): KnockoutSubscribable<T>;
 		toKoObservable(initialValue?: T): KnockoutObservable<T>;
diff --git a/promises-a-plus/promises-a-plus-tests.ts b/promises-a-plus/promises-a-plus-tests.ts
index 042c4f066..bba258649 100644
--- a/promises-a-plus/promises-a-plus-tests.ts
+++ b/promises-a-plus/promises-a-plus-tests.ts
@@ -1,5 +1,5 @@
 /// <reference path="promises-a-plus.d.ts"/>
-/// <reference path="../rx.js/rx.async.d.ts"/>
+/// <reference path="../rx/rx.async.d.ts"/>
 /// <reference path="../es6-promise/es6-promise.d.ts"/>
 /// <reference path="../q/Q.d.ts"/>
 import When = require("../when/when");
diff --git a/rx.js/rx.jquery.d.ts b/rx-jquery/rx.jquery.d.ts
similarity index 99%
rename from rx.js/rx.jquery.d.ts
rename to rx-jquery/rx.jquery.d.ts
index ace0c5071..d3d405451 100644
--- a/rx.js/rx.jquery.d.ts
+++ b/rx-jquery/rx.jquery.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 ///<reference path="../jquery/jquery.d.ts"/>
-///<reference path="rx.d.ts"/>
+///<reference path="../rx/rx.d.ts"/>
 
 interface RxJQueryAjaxResult<T> {
 	data: T;
diff --git a/rx.js/rx-lite.d.ts b/rx/rx-lite.d.ts
similarity index 100%
rename from rx.js/rx-lite.d.ts
rename to rx/rx-lite.d.ts
diff --git a/rx.js/rx.aggregates.d.ts b/rx/rx.aggregates.d.ts
similarity index 100%
rename from rx.js/rx.aggregates.d.ts
rename to rx/rx.aggregates.d.ts
diff --git a/rx.js/rx.all.ts b/rx/rx.all.ts
similarity index 100%
rename from rx.js/rx.all.ts
rename to rx/rx.all.ts
diff --git a/rx.js/rx.async-lite.d.ts b/rx/rx.async-lite.d.ts
similarity index 100%
rename from rx.js/rx.async-lite.d.ts
rename to rx/rx.async-lite.d.ts
diff --git a/rx.js/rx.async-tests.ts b/rx/rx.async-tests.ts
similarity index 100%
rename from rx.js/rx.async-tests.ts
rename to rx/rx.async-tests.ts
diff --git a/rx.js/rx.async.d.ts b/rx/rx.async.d.ts
similarity index 100%
rename from rx.js/rx.async.d.ts
rename to rx/rx.async.d.ts
diff --git a/rx.js/rx.backpressure-lite.d.ts b/rx/rx.backpressure-lite.d.ts
similarity index 100%
rename from rx.js/rx.backpressure-lite.d.ts
rename to rx/rx.backpressure-lite.d.ts
diff --git a/rx.js/rx.backpressure-tests.ts b/rx/rx.backpressure-tests.ts
similarity index 100%
rename from rx.js/rx.backpressure-tests.ts
rename to rx/rx.backpressure-tests.ts
diff --git a/rx.js/rx.backpressure.d.ts b/rx/rx.backpressure.d.ts
similarity index 100%
rename from rx.js/rx.backpressure.d.ts
rename to rx/rx.backpressure.d.ts
diff --git a/rx.js/rx.binding-lite.d.ts b/rx/rx.binding-lite.d.ts
similarity index 100%
rename from rx.js/rx.binding-lite.d.ts
rename to rx/rx.binding-lite.d.ts
diff --git a/rx.js/rx.binding.d.ts b/rx/rx.binding.d.ts
similarity index 100%
rename from rx.js/rx.binding.d.ts
rename to rx/rx.binding.d.ts
diff --git a/rx.js/rx.coincidence-lite.d.ts b/rx/rx.coincidence-lite.d.ts
similarity index 100%
rename from rx.js/rx.coincidence-lite.d.ts
rename to rx/rx.coincidence-lite.d.ts
diff --git a/rx.js/rx.coincidence.d.ts b/rx/rx.coincidence.d.ts
similarity index 100%
rename from rx.js/rx.coincidence.d.ts
rename to rx/rx.coincidence.d.ts
diff --git a/rx.js/rx.d.ts b/rx/rx.d.ts
similarity index 100%
rename from rx.js/rx.d.ts
rename to rx/rx.d.ts
diff --git a/rx.js/rx.experimental.d.ts b/rx/rx.experimental.d.ts
similarity index 100%
rename from rx.js/rx.experimental.d.ts
rename to rx/rx.experimental.d.ts
diff --git a/rx.js/rx.joinpatterns.d.ts b/rx/rx.joinpatterns.d.ts
similarity index 100%
rename from rx.js/rx.joinpatterns.d.ts
rename to rx/rx.joinpatterns.d.ts
diff --git a/rx.js/rx.lite.d.ts b/rx/rx.lite.d.ts
similarity index 100%
rename from rx.js/rx.lite.d.ts
rename to rx/rx.lite.d.ts
diff --git a/rx.js/rx.testing.d.ts b/rx/rx.testing.d.ts
similarity index 100%
rename from rx.js/rx.testing.d.ts
rename to rx/rx.testing.d.ts
diff --git a/rx.js/rx.time-lite.d.ts b/rx/rx.time-lite.d.ts
similarity index 100%
rename from rx.js/rx.time-lite.d.ts
rename to rx/rx.time-lite.d.ts
diff --git a/rx.js/rx.time.d.ts b/rx/rx.time.d.ts
similarity index 100%
rename from rx.js/rx.time.d.ts
rename to rx/rx.time.d.ts
diff --git a/rx.js/rx.virtualtime.d.ts b/rx/rx.virtualtime.d.ts
similarity index 100%
rename from rx.js/rx.virtualtime.d.ts
rename to rx/rx.virtualtime.d.ts