diff --git a/ext/src/shim/cast/classes/Session.ts b/ext/src/shim/cast/classes/Session.ts
index 4825ed5..9dcd548 100755
--- a/ext/src/shim/cast/classes/Session.ts
+++ b/ext/src/shim/cast/classes/Session.ts
@@ -8,9 +8,9 @@ import Receiver from "./Receiver";
 import SenderApplication from "./SenderApplication";
 import Volume from "./Volume";
 
-import LoadRequest from "../../media/classes/LoadRequest";
-import Media from "../../media/classes/Media";
-import QueueLoadRequest from "../../media/classes/QueueLoadRequest";
+import LoadRequest from "../media/classes/LoadRequest";
+import Media from "../media/classes/Media";
+import QueueLoadRequest from "../media/classes/QueueLoadRequest";
 
 import { ErrorCode
        , SessionStatus
diff --git a/ext/src/shim/cast/index.ts b/ext/src/shim/cast/index.ts
index 195b2af..49df3e5 100755
--- a/ext/src/shim/cast/index.ts
+++ b/ext/src/shim/cast/index.ts
@@ -24,13 +24,12 @@ import { AutoJoinPolicy
        , SessionStatus
        , VolumeControlType } from "./enums";
 
+import media from "./media";
 
 import { requestSession as requestSessionTimeout } from "../timeout";
-
 import { onMessage, sendMessageResponse } from "../messageBridge";
 
 
-
 type ReceiverActionListener = (
         receiver: Receiver
       , receiverAction: typeof ReceiverAction) => void;
@@ -68,6 +67,9 @@ export default {
   , isAvailable: false
   , timeout: new Timeout()
 
+    // chrome.cast.media namespace
+  , media
+
 
   , addReceiverActionListener: (
             listener: ReceiverActionListener): void => {
diff --git a/ext/src/shim/media/classes/EditTracksInfoRequest.ts b/ext/src/shim/cast/media/classes/EditTracksInfoRequest.ts
similarity index 100%
rename from ext/src/shim/media/classes/EditTracksInfoRequest.ts
rename to ext/src/shim/cast/media/classes/EditTracksInfoRequest.ts
diff --git a/ext/src/shim/media/classes/GenericMediaMetadata.ts b/ext/src/shim/cast/media/classes/GenericMediaMetadata.ts
similarity index 89%
rename from ext/src/shim/media/classes/GenericMediaMetadata.ts
rename to ext/src/shim/cast/media/classes/GenericMediaMetadata.ts
index ffe5837..b40ecf3 100644
--- a/ext/src/shim/media/classes/GenericMediaMetadata.ts
+++ b/ext/src/shim/cast/media/classes/GenericMediaMetadata.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import Image from "../../cast/classes/Image";
+import Image from "../../classes/Image";
 
 import { MetadataType } from "../enums";
 
diff --git a/ext/src/shim/media/classes/GetStatusRequest.ts b/ext/src/shim/cast/media/classes/GetStatusRequest.ts
similarity index 100%
rename from ext/src/shim/media/classes/GetStatusRequest.ts
rename to ext/src/shim/cast/media/classes/GetStatusRequest.ts
diff --git a/ext/src/shim/media/classes/LoadRequest.ts b/ext/src/shim/cast/media/classes/LoadRequest.ts
similarity index 100%
rename from ext/src/shim/media/classes/LoadRequest.ts
rename to ext/src/shim/cast/media/classes/LoadRequest.ts
diff --git a/ext/src/shim/media/classes/Media.ts b/ext/src/shim/cast/media/classes/Media.ts
similarity index 97%
rename from ext/src/shim/media/classes/Media.ts
rename to ext/src/shim/cast/media/classes/Media.ts
index ca6241e..1ded14c 100644
--- a/ext/src/shim/media/classes/Media.ts
+++ b/ext/src/shim/cast/media/classes/Media.ts
@@ -15,21 +15,21 @@ import SeekRequest from "./SeekRequest";
 import StopRequest from "./StopRequest";
 import VolumeRequest from "./VolumeRequest";
 
-import Volume from "../../cast/classes/Volume";
+import Volume from "../../classes/Volume";
 
 import { PlayerState
        , RepeatMode } from "../enums";
 
-import _Error from "../../cast/classes/Error";
-import { ErrorCode } from "../../cast/enums";
+import _Error from "../../classes/Error";
+import { ErrorCode } from "../../enums";
 
-import { onMessage, sendMessageResponse } from "../../messageBridge";
+import { onMessage, sendMessageResponse } from "../../../messageBridge";
 
 import { Callbacks
        , CallbacksMap
        , ErrorCallback
        , SuccessCallback
-       , UpdateListener } from "../../types";
+       , UpdateListener } from "../../../types";
 
 
 const _id = new WeakMap<Media, string>();
diff --git a/ext/src/shim/media/classes/MediaInfo.ts b/ext/src/shim/cast/media/classes/MediaInfo.ts
similarity index 100%
rename from ext/src/shim/media/classes/MediaInfo.ts
rename to ext/src/shim/cast/media/classes/MediaInfo.ts
diff --git a/ext/src/shim/media/classes/MovieMediaMetadata.ts b/ext/src/shim/cast/media/classes/MovieMediaMetadata.ts
similarity index 90%
rename from ext/src/shim/media/classes/MovieMediaMetadata.ts
rename to ext/src/shim/cast/media/classes/MovieMediaMetadata.ts
index 03d5e5a..30d24a3 100644
--- a/ext/src/shim/media/classes/MovieMediaMetadata.ts
+++ b/ext/src/shim/cast/media/classes/MovieMediaMetadata.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import Image from "../../cast/classes/Image";
+import Image from "../../classes/Image";
 
 import { MetadataType } from "../enums";
 
diff --git a/ext/src/shim/media/classes/MusicTrackMediaMetadata.ts b/ext/src/shim/cast/media/classes/MusicTrackMediaMetadata.ts
similarity index 93%
rename from ext/src/shim/media/classes/MusicTrackMediaMetadata.ts
rename to ext/src/shim/cast/media/classes/MusicTrackMediaMetadata.ts
index b23bf15..50fcbf9 100644
--- a/ext/src/shim/media/classes/MusicTrackMediaMetadata.ts
+++ b/ext/src/shim/cast/media/classes/MusicTrackMediaMetadata.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import Image from "../../cast/classes/Image";
+import Image from "../../classes/Image";
 
 import { MetadataType } from "../enums";
 
diff --git a/ext/src/shim/media/classes/PauseRequest.ts b/ext/src/shim/cast/media/classes/PauseRequest.ts
similarity index 100%
rename from ext/src/shim/media/classes/PauseRequest.ts
rename to ext/src/shim/cast/media/classes/PauseRequest.ts
diff --git a/ext/src/shim/media/classes/PhotoMediaMetadata.ts b/ext/src/shim/cast/media/classes/PhotoMediaMetadata.ts
similarity index 91%
rename from ext/src/shim/media/classes/PhotoMediaMetadata.ts
rename to ext/src/shim/cast/media/classes/PhotoMediaMetadata.ts
index da72c63..43501a0 100644
--- a/ext/src/shim/media/classes/PhotoMediaMetadata.ts
+++ b/ext/src/shim/cast/media/classes/PhotoMediaMetadata.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import Image from "../../cast/classes/Image";
+import Image from "../../classes/Image";
 
 import { MetadataType } from "../enums";
 
diff --git a/ext/src/shim/media/classes/PlayRequest.ts b/ext/src/shim/cast/media/classes/PlayRequest.ts
similarity index 100%
rename from ext/src/shim/media/classes/PlayRequest.ts
rename to ext/src/shim/cast/media/classes/PlayRequest.ts
diff --git a/ext/src/shim/media/classes/QueueInsertItemsRequest.ts b/ext/src/shim/cast/media/classes/QueueInsertItemsRequest.ts
similarity index 100%
rename from ext/src/shim/media/classes/QueueInsertItemsRequest.ts
rename to ext/src/shim/cast/media/classes/QueueInsertItemsRequest.ts
diff --git a/ext/src/shim/media/classes/QueueItem.ts b/ext/src/shim/cast/media/classes/QueueItem.ts
similarity index 100%
rename from ext/src/shim/media/classes/QueueItem.ts
rename to ext/src/shim/cast/media/classes/QueueItem.ts
diff --git a/ext/src/shim/media/classes/QueueLoadRequest.ts b/ext/src/shim/cast/media/classes/QueueLoadRequest.ts
similarity index 100%
rename from ext/src/shim/media/classes/QueueLoadRequest.ts
rename to ext/src/shim/cast/media/classes/QueueLoadRequest.ts
diff --git a/ext/src/shim/media/classes/QueueRemoveItemsRequest.ts b/ext/src/shim/cast/media/classes/QueueRemoveItemsRequest.ts
similarity index 100%
rename from ext/src/shim/media/classes/QueueRemoveItemsRequest.ts
rename to ext/src/shim/cast/media/classes/QueueRemoveItemsRequest.ts
diff --git a/ext/src/shim/media/classes/QueueReorderItemsRequest.ts b/ext/src/shim/cast/media/classes/QueueReorderItemsRequest.ts
similarity index 100%
rename from ext/src/shim/media/classes/QueueReorderItemsRequest.ts
rename to ext/src/shim/cast/media/classes/QueueReorderItemsRequest.ts
diff --git a/ext/src/shim/media/classes/QueueSetPropertiesRequest.ts b/ext/src/shim/cast/media/classes/QueueSetPropertiesRequest.ts
similarity index 100%
rename from ext/src/shim/media/classes/QueueSetPropertiesRequest.ts
rename to ext/src/shim/cast/media/classes/QueueSetPropertiesRequest.ts
diff --git a/ext/src/shim/media/classes/QueueUpdateItemsRequest.ts b/ext/src/shim/cast/media/classes/QueueUpdateItemsRequest.ts
similarity index 100%
rename from ext/src/shim/media/classes/QueueUpdateItemsRequest.ts
rename to ext/src/shim/cast/media/classes/QueueUpdateItemsRequest.ts
diff --git a/ext/src/shim/media/classes/SeekRequest.ts b/ext/src/shim/cast/media/classes/SeekRequest.ts
similarity index 100%
rename from ext/src/shim/media/classes/SeekRequest.ts
rename to ext/src/shim/cast/media/classes/SeekRequest.ts
diff --git a/ext/src/shim/media/classes/StopRequest.ts b/ext/src/shim/cast/media/classes/StopRequest.ts
similarity index 100%
rename from ext/src/shim/media/classes/StopRequest.ts
rename to ext/src/shim/cast/media/classes/StopRequest.ts
diff --git a/ext/src/shim/media/classes/TextTrackStyle.ts b/ext/src/shim/cast/media/classes/TextTrackStyle.ts
similarity index 100%
rename from ext/src/shim/media/classes/TextTrackStyle.ts
rename to ext/src/shim/cast/media/classes/TextTrackStyle.ts
diff --git a/ext/src/shim/media/classes/Track.ts b/ext/src/shim/cast/media/classes/Track.ts
similarity index 100%
rename from ext/src/shim/media/classes/Track.ts
rename to ext/src/shim/cast/media/classes/Track.ts
diff --git a/ext/src/shim/media/classes/TvShowMediaMetadata.ts b/ext/src/shim/cast/media/classes/TvShowMediaMetadata.ts
similarity index 92%
rename from ext/src/shim/media/classes/TvShowMediaMetadata.ts
rename to ext/src/shim/cast/media/classes/TvShowMediaMetadata.ts
index 37536e1..e9b70b8 100644
--- a/ext/src/shim/media/classes/TvShowMediaMetadata.ts
+++ b/ext/src/shim/cast/media/classes/TvShowMediaMetadata.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import Image from "../../cast/classes/Image";
+import Image from "../../classes/Image";
 
 import { MetadataType } from "../enums";
 
diff --git a/ext/src/shim/media/classes/VolumeRequest.ts b/ext/src/shim/cast/media/classes/VolumeRequest.ts
similarity index 75%
rename from ext/src/shim/media/classes/VolumeRequest.ts
rename to ext/src/shim/cast/media/classes/VolumeRequest.ts
index 55d959e..134f303 100644
--- a/ext/src/shim/media/classes/VolumeRequest.ts
+++ b/ext/src/shim/cast/media/classes/VolumeRequest.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import Volume from "../../cast/classes/Volume";
+import Volume from "../../classes/Volume";
 
 
 export default class VolumeRequest {
diff --git a/ext/src/shim/media/enums/index.ts b/ext/src/shim/cast/media/enums/index.ts
similarity index 100%
rename from ext/src/shim/media/enums/index.ts
rename to ext/src/shim/cast/media/enums/index.ts
diff --git a/ext/src/shim/media/index.ts b/ext/src/shim/cast/media/index.ts
similarity index 100%
rename from ext/src/shim/media/index.ts
rename to ext/src/shim/cast/media/index.ts
diff --git a/ext/src/shim/index.ts b/ext/src/shim/index.ts
index 6bf581d..f9c6059 100755
--- a/ext/src/shim/index.ts
+++ b/ext/src/shim/index.ts
@@ -1,7 +1,6 @@
 "use strict";
 
 import cast from "./cast";
-import media from "./media";
 
 import { onMessage } from "./messageBridge";
 
@@ -13,7 +12,6 @@ if (!global.chrome) {
 }
 
 global.chrome.cast = cast;
-global.chrome.cast.media = media;
 
 
 onMessage(message => {
diff --git a/ext/src/shim/types.ts b/ext/src/shim/types.ts
index 3e04d56..ffe6f70 100644
--- a/ext/src/shim/types.ts
+++ b/ext/src/shim/types.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import _Error from "./cast/classes/Error";
-import Media from "./media/classes/Media";
+import Media from "./cast/media/classes/Media";
 
 export type SuccessCallback = () => void;
 export type ErrorCallback = (err: _Error) => void;