Index: /trunk/src/wp-includes/js/media/audio-video.js
===================================================================
--- /trunk/src/wp-includes/js/media/audio-video.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/audio-video.js	(revision 31935)
@@ -346,5 +346,5 @@
  * @augments Backbone.View
  */
-var MediaDetails = require( './media-details' ),
+var MediaDetails = wp.media.view.MediaDetails,
 	AudioDetails;
 
@@ -372,5 +372,5 @@
 module.exports = AudioDetails;
 
-},{"./media-details":9}],6:[function(require,module,exports){
+},{}],6:[function(require,module,exports){
 /*globals wp */
 
@@ -390,7 +390,5 @@
 var MediaDetails = wp.media.view.MediaFrame.MediaDetails,
 	MediaLibrary = wp.media.controller.MediaLibrary,
-	
-	AudioDetailsView = require( '../audio-details.js' ),
-	AudioDetailsController = require( '../../controllers/audio-details.js' ),
+
 	l10n = wp.media.view.l10n,
 	AudioDetails;
@@ -409,5 +407,5 @@
 
 	initialize: function( options ) {
-		options.DetailsView = AudioDetailsView;
+		options.DetailsView = wp.media.view.AudioDetails;
 		options.cancelText = l10n.audioDetailsCancel;
 		options.addText = l10n.audioAddSourceTitle;
@@ -425,5 +423,5 @@
 	createStates: function() {
 		this.states.add([
-			new AudioDetailsController( {
+			new wp.media.controller.AudioDetails( {
 				media: this.media
 			} ),
@@ -452,5 +450,5 @@
 module.exports = AudioDetails;
 
-},{"../../controllers/audio-details.js":2,"../audio-details.js":5}],7:[function(require,module,exports){
+},{}],7:[function(require,module,exports){
 /*globals wp */
 
@@ -467,7 +465,5 @@
  * @mixes wp.media.controller.StateMachine
  */
-var View = wp.media.View,
-	Toolbar = wp.media.view.Toolbar,
-	Select = wp.media.view.MediaFrame.Select,
+var Select = wp.media.view.MediaFrame.Select,
 	l10n = wp.media.view.l10n,
 	MediaDetails;
@@ -532,5 +528,5 @@
 				}
 			},
-			separateCancel: new View({
+			separateCancel: new wp.media.View({
 				className: 'separator',
 				priority: 40
@@ -541,5 +537,5 @@
 
 	setPrimaryButton: function(text, handler) {
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
@@ -604,6 +600,4 @@
 var MediaDetails = wp.media.view.MediaFrame.MediaDetails,
 	MediaLibrary = wp.media.controller.MediaLibrary,
-	VideoDetailsView = require( '../video-details.js' ),
-	VideoDetailsController = require( '../../controllers/video-details.js' ),
 	l10n = wp.media.view.l10n,
 	VideoDetails;
@@ -622,5 +616,5 @@
 
 	initialize: function( options ) {
-		options.DetailsView = VideoDetailsView;
+		options.DetailsView = wp.media.view.VideoDetails;
 		options.cancelText = l10n.videoDetailsCancel;
 		options.addText = l10n.videoAddSourceTitle;
@@ -640,5 +634,5 @@
 	createStates: function() {
 		this.states.add([
-			new VideoDetailsController({
+			new wp.media.controller.VideoDetails({
 				media: this.media
 			}),
@@ -725,5 +719,5 @@
 module.exports = VideoDetails;
 
-},{"../../controllers/video-details.js":3,"../video-details.js":10}],9:[function(require,module,exports){
+},{}],9:[function(require,module,exports){
 /*global wp, jQuery, _, MediaElementPlayer */
 
@@ -907,5 +901,5 @@
  * @augments Backbone.View
  */
-var MediaDetails = require( './media-details' ),
+var MediaDetails = wp.media.view.MediaDetails,
 	VideoDetails;
 
@@ -938,3 +932,3 @@
 module.exports = VideoDetails;
 
-},{"./media-details":9}]},{},[1]);
+},{}]},{},[1]);
Index: /trunk/src/wp-includes/js/media/controllers/collection-add.js
===================================================================
--- /trunk/src/wp-includes/js/media/controllers/collection-add.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/controllers/collection-add.js	(revision 31935)
@@ -35,5 +35,5 @@
  */
 var Selection = wp.media.model.Selection,
-	Library = require( './library.js' ),
+	Library = wp.media.controller.Library,
 	CollectionAdd;
 
Index: /trunk/src/wp-includes/js/media/controllers/collection-edit.js
===================================================================
--- /trunk/src/wp-includes/js/media/controllers/collection-edit.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/controllers/collection-edit.js	(revision 31935)
@@ -35,7 +35,5 @@
  * @param {string}                     attributes.collectionType         The collection type. (e.g. 'playlist').
  */
-var Library = require( './library.js' ),
-	View = require( '../views/view.js' ),
-	EditLibraryView = require( '../views/attachment/edit-library.js' ),
+var Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	$ = jQuery,
@@ -76,5 +74,5 @@
 		// The single `Attachment` view to be used in the `Attachments` view.
 		if ( ! this.get('AttachmentView') ) {
-			this.set( 'AttachmentView', EditLibraryView );
+			this.set( 'AttachmentView', wp.media.view.Attachment.EditLibrary );
 		}
 		Library.prototype.initialize.apply( this, arguments );
@@ -142,5 +140,5 @@
 
 		if ( dragInfoText ) {
-			attachmentsBrowserView.toolbar.set( 'dragInfo', new View({
+			attachmentsBrowserView.toolbar.set( 'dragInfo', new wp.media.View({
 				el: $( '<div class="instructions">' + dragInfoText + '</div>' )[0],
 				priority: -40
Index: /trunk/src/wp-includes/js/media/controllers/cropper.js
===================================================================
--- /trunk/src/wp-includes/js/media/controllers/cropper.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/controllers/cropper.js	(revision 31935)
@@ -10,11 +10,8 @@
  * @augments Backbone.Model
  */
-var State = require( './state.js' ),
-	ToolbarView = require( '../views/toolbar.js' ),
-	CropperView = require( '../views/cropper.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	Cropper;
 
-Cropper = State.extend({
+Cropper = wp.media.controller.State.extend({
 	defaults: {
 		id:          'cropper',
@@ -39,5 +36,5 @@
 
 	createCropContent: function() {
-		this.cropperView = new CropperView({
+		this.cropperView = new wp.media.view.Cropper({
 			controller: this,
 			attachment: this.get('selection').first()
@@ -105,5 +102,5 @@
 		}
 
-		this.frame.toolbar.set( new ToolbarView(toolbarOptions) );
+		this.frame.toolbar.set( new wp.media.view.Toolbar(toolbarOptions) );
 	},
 
Index: /trunk/src/wp-includes/js/media/controllers/edit-attachment-metadata.js
===================================================================
--- /trunk/src/wp-includes/js/media/controllers/edit-attachment-metadata.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/controllers/edit-attachment-metadata.js	(revision 31935)
@@ -10,9 +10,8 @@
  * @augments Backbone.Model
  */
-var State = wp.media.controller.State,
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	EditAttachmentMetadata;
 
-EditAttachmentMetadata = State.extend({
+EditAttachmentMetadata = wp.media.controller.State.extend({
 	defaults: {
 		id:      'edit-attachment',
Index: /trunk/src/wp-includes/js/media/controllers/edit-image.js
===================================================================
--- /trunk/src/wp-includes/js/media/controllers/edit-image.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/controllers/edit-image.js	(revision 31935)
@@ -19,10 +19,8 @@
  * @param {string}                    [attributes.url]                Unused. @todo Consider removal.
  */
-var State = require( './state.js' ),
-	ToolbarView = require( '../views/toolbar.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	EditImage;
 
-EditImage = State.extend({
+EditImage = wp.media.controller.State.extend({
 	defaults: {
 		id:      'edit-image',
@@ -56,5 +54,5 @@
 			previous = lastState && lastState.id;
 
-		frame.toolbar.set( new ToolbarView({
+		frame.toolbar.set( new wp.media.view.Toolbar({
 			controller: frame,
 			items: {
Index: /trunk/src/wp-includes/js/media/controllers/embed.js
===================================================================
--- /trunk/src/wp-includes/js/media/controllers/embed.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/controllers/embed.js	(revision 31935)
@@ -22,10 +22,9 @@
  * @param {object} [attributes.metadata={}]           Properties of the embed, which will override attributes.url if set.
  */
-var State = require( './state.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	$ = Backbone.$,
 	Embed;
 
-Embed = State.extend({
+Embed = wp.media.controller.State.extend({
 	defaults: {
 		id:       'embed',
Index: /trunk/src/wp-includes/js/media/controllers/featured-image.js
===================================================================
--- /trunk/src/wp-includes/js/media/controllers/featured-image.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/controllers/featured-image.js	(revision 31935)
@@ -33,5 +33,5 @@
  */
 var Attachment = wp.media.model.Attachment,
-	Library = require( './library.js' ),
+	Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	FeaturedImage;
Index: /trunk/src/wp-includes/js/media/controllers/gallery-add.js
===================================================================
--- /trunk/src/wp-includes/js/media/controllers/gallery-add.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/controllers/gallery-add.js	(revision 31935)
@@ -33,5 +33,5 @@
  */
 var Selection = wp.media.model.Selection,
-	Library = require( './library.js' ),
+	Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	GalleryAdd;
Index: /trunk/src/wp-includes/js/media/controllers/gallery-edit.js
===================================================================
--- /trunk/src/wp-includes/js/media/controllers/gallery-edit.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/controllers/gallery-edit.js	(revision 31935)
@@ -32,7 +32,5 @@
  *                                                                        If none supplied, defaults to wp.media.view.Attachment.EditLibrary.
  */
-var Library = require( './library.js' ),
-	EditLibraryView = require( '../views/attachment/edit-library.js' ),
-	GallerySettingsView = require( '../views/settings/gallery.js' ),
+var Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	GalleryEdit;
@@ -68,5 +66,5 @@
 		// The single `Attachment` view to be used in the `Attachments` view.
 		if ( ! this.get('AttachmentView') ) {
-			this.set( 'AttachmentView', EditLibraryView );
+			this.set( 'AttachmentView', wp.media.view.Attachment.EditLibrary );
 		}
 
@@ -122,5 +120,5 @@
 
 		browser.sidebar.set({
-			gallery: new GallerySettingsView({
+			gallery: new wp.media.view.Settings.Gallery({
 				controller: this,
 				model:      library.gallery,
Index: /trunk/src/wp-includes/js/media/controllers/image-details.js
===================================================================
--- /trunk/src/wp-includes/js/media/controllers/image-details.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/controllers/image-details.js	(revision 31935)
@@ -25,6 +25,6 @@
  *       however this may not do anything.
  */
-var State = require( './state.js' ),
-	Library = require( './library.js' ),
+var State = wp.media.controller.State,
+	Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	ImageDetails;
Index: /trunk/src/wp-includes/js/media/controllers/library.js
===================================================================
--- /trunk/src/wp-includes/js/media/controllers/library.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/controllers/library.js	(revision 31935)
@@ -35,12 +35,10 @@
  * @param {boolean}                         [attributes.syncSelection=true]      Whether the Attachments selection should be persisted from the last state.
  */
-var selectionSync = require( '../utils/selection-sync.js' ),
-	State = require( './state.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	getUserSetting = window.getUserSetting,
 	setUserSetting = window.setUserSetting,
 	Library;
 
-Library = State.extend({
+Library = wp.media.controller.State.extend({
 	defaults: {
 		id:                 'library',
@@ -270,5 +268,5 @@
 
 // Make selectionSync available on any Media Library state.
-_.extend( Library.prototype, selectionSync );
+_.extend( Library.prototype, wp.media.selectionSync );
 
 module.exports = Library;
Index: /trunk/src/wp-includes/js/media/controllers/media-library.js
===================================================================
--- /trunk/src/wp-includes/js/media/controllers/media-library.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/controllers/media-library.js	(revision 31935)
@@ -9,5 +9,5 @@
  * @augments Backbone.Model
  */
-var Library = require( './library.js' ),
+var Library = wp.media.controller.Library,
 	MediaLibrary;
 
Index: /trunk/src/wp-includes/js/media/controllers/replace-image.js
===================================================================
--- /trunk/src/wp-includes/js/media/controllers/replace-image.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/controllers/replace-image.js	(revision 31935)
@@ -32,5 +32,5 @@
  * @param {boolean}                    [attributes.syncSelection=true]      Whether the Attachments selection should be persisted from the last state.
  */
-var Library = require( './library.js' ),
+var Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	ReplaceImage;
Index: /trunk/src/wp-includes/js/media/grid.js
===================================================================
--- /trunk/src/wp-includes/js/media/grid.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/grid.js	(revision 31935)
@@ -11,9 +11,8 @@
  * @augments Backbone.Model
  */
-var State = wp.media.controller.State,
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	EditAttachmentMetadata;
 
-EditAttachmentMetadata = State.extend({
+EditAttachmentMetadata = wp.media.controller.State.extend({
 	defaults: {
 		id:      'edit-attachment',
@@ -141,4 +140,6 @@
 
 },{}],5:[function(require,module,exports){
+/*globals wp */
+
 /**
  * wp.media.view.DeleteSelectedPermanentlyButton
@@ -154,5 +155,5 @@
  */
 var Button = wp.media.view.Button,
-	DeleteSelected = require( './delete-selected.js' ),
+	DeleteSelected = wp.media.view.DeleteSelectedButton,
 	DeleteSelectedPermanently;
 
@@ -187,5 +188,5 @@
 module.exports = DeleteSelectedPermanently;
 
-},{"./delete-selected.js":6}],6:[function(require,module,exports){
+},{}],6:[function(require,module,exports){
 /*globals wp */
 
@@ -366,11 +367,4 @@
 var Frame = wp.media.view.Frame,
 	MediaFrame = wp.media.view.MediaFrame,
-	Modal = wp.media.view.Modal,
-	AttachmentCompat = wp.media.view.AttachmentCompat,
-	EditImageController = wp.media.controller.EditImage,
-
-	EditAttachmentMetadata = require( '../../controllers/edit-attachment-metadata.js' ),
-	TwoColumn = require( '../attachment/details-two-column.js' ),
-	DetailsView = require( '../edit-image-details.js' ),
 
 	$ = jQuery,
@@ -428,5 +422,5 @@
 		// Initialize modal container view.
 		if ( this.options.modal ) {
-			this.modal = new Modal({
+			this.modal = new wp.media.view.Modal({
 				controller: this,
 				title:      this.options.title
@@ -457,5 +451,5 @@
 	createStates: function() {
 		this.states.add([
-			new EditAttachmentMetadata( { model: this.model } )
+			new wp.media.controller.EditAttachmentMetadata( { model: this.model } )
 		]);
 	},
@@ -468,5 +462,5 @@
 	 */
 	editMetadataMode: function( contentRegion ) {
-		contentRegion.view = new TwoColumn({
+		contentRegion.view = new wp.media.view.Attachment.Details.TwoColumn({
 			controller: this,
 			model:      this.model
@@ -477,5 +471,5 @@
 		 * `attachment_fields_to_edit` filter.
 		 */
-		contentRegion.view.views.set( '.attachment-compat', new AttachmentCompat({
+		contentRegion.view.views.set( '.attachment-compat', new wp.media.view.AttachmentCompat({
 			controller: this,
 			model:      this.model
@@ -495,5 +489,5 @@
 	 */
 	editImageMode: function( contentRegion ) {
-		var editImageController = new EditImageController( {
+		var editImageController = new wp.media.controller.EditImage( {
 			model: this.model,
 			frame: this
@@ -504,5 +498,5 @@
 		editImageController._menu = function() {};
 
-		contentRegion.view = new DetailsView( {
+		contentRegion.view = new wp.media.view.EditImage.Details( {
 			model: this.model,
 			frame: this,
@@ -597,5 +591,5 @@
 module.exports = EditAttachments;
 
-},{"../../controllers/edit-attachment-metadata.js":1,"../attachment/details-two-column.js":4,"../edit-image-details.js":8}],10:[function(require,module,exports){
+},{}],10:[function(require,module,exports){
 /*globals wp, _, Backbone */
 
@@ -616,9 +610,5 @@
  */
 var MediaFrame = wp.media.view.MediaFrame,
-	UploaderWindow = wp.media.view.UploaderWindow,
-	AttachmentsBrowser = wp.media.view.AttachmentsBrowser,
 	Library = wp.media.controller.Library,
-
-	Router = require( '../../routers/manage.js' ),
 
 	$ = Backbone.$,
@@ -658,5 +648,5 @@
 		// Initialize a window-wide uploader.
 		if ( this.options.uploader ) {
-			this.uploader = new UploaderWindow({
+			this.uploader = new wp.media.view.UploaderWindow({
 				controller: this,
 				uploader: {
@@ -671,5 +661,5 @@
 		}
 
-		this.gridRouter = new Router();
+		this.gridRouter = new wp.media.view.MediaFrame.Manage.Router();
 
 		// Call 'initialize' directly on the parent class.
@@ -821,5 +811,5 @@
 
 		// Browse our library of attachments.
-		this.browserView = contentRegion.view = new AttachmentsBrowser({
+		this.browserView = contentRegion.view = new wp.media.view.AttachmentsBrowser({
 			controller: this,
 			collection: state.get('library'),
@@ -871,3 +861,3 @@
 module.exports = Manage;
 
-},{"../../routers/manage.js":3}]},{},[2]);
+},{}]},{},[2]);
Index: /trunk/src/wp-includes/js/media/models.js
===================================================================
--- /trunk/src/wp-includes/js/media/models.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/models.js	(revision 31935)
@@ -59,6 +59,6 @@
 delete l10n.settings;
 
+Attachment = media.model.Attachment = require( './models/attachment.js' );
 Attachments = media.model.Attachments = require( './models/attachments.js' );
-Attachment = media.model.Attachment = require( './models/attachment.js' );
 
 media.model.Query = require( './models/query.js' );
@@ -380,5 +380,5 @@
 	 */
 	create: function( attrs ) {
-		var Attachments = require( './attachments.js' );
+		var Attachments = wp.media.model.Attachments;
 		return Attachments.all.push( attrs );
 	},
@@ -395,5 +395,5 @@
 	 */
 	get: _.memoize( function( id, attachment ) {
-		var Attachments = require( './attachments.js' );
+		var Attachments = wp.media.model.Attachments;
 		return Attachments.all.push( attachment || { id: id } );
 	})
@@ -402,5 +402,5 @@
 module.exports = Attachment;
 
-},{"./attachments.js":3}],3:[function(require,module,exports){
+},{}],3:[function(require,module,exports){
 /*globals wp, _, Backbone */
 
@@ -427,12 +427,9 @@
  *
  */
-var Attachment = require( './attachment.js' ),
-	Attachments;
-
-Attachments = Backbone.Collection.extend({
+var Attachments = Backbone.Collection.extend({
 	/**
 	 * @type {wp.media.model.Attachment}
 	 */
-	model: Attachment,
+	model: wp.media.model.Attachment,
 	/**
 	 * @param {Array} [models=[]] Array of models used to populate the collection.
@@ -772,5 +769,5 @@
 			}
 
-			attachment = Attachment.get( id );
+			attachment = wp.media.model.Attachment.get( id );
 			newAttributes = attachment.parse( attrs, xhr );
 
@@ -788,10 +785,9 @@
 	 */
 	_requery: function( refresh ) {
-		var props, Query;
+		var props;
 		if ( this.props.get('query') ) {
-			Query = require( './query.js' );
 			props = this.props.toJSON();
 			props.cache = ( true !== refresh );
-			this.mirror( Query.get( props ) );
+			this.mirror( wp.media.model.Query.get( props ) );
 		}
 	},
@@ -940,5 +936,5 @@
 module.exports = Attachments;
 
-},{"./attachment.js":2,"./query.js":5}],4:[function(require,module,exports){
+},{}],4:[function(require,module,exports){
 /*globals Backbone */
 
@@ -956,10 +952,8 @@
  * @param {int} [attributes.attachment_id] ID of the attachment.
  **/
-var Attachment = require( './attachment' ),
-	PostImage;
-
-PostImage = Backbone.Model.extend({
+var PostImage = Backbone.Model.extend({
 
 	initialize: function( attributes ) {
+		var Attachment = wp.media.model.Attachment;
 		this.attachment = false;
 
@@ -1098,5 +1092,5 @@
 module.exports = PostImage;
 
-},{"./attachment":2}],5:[function(require,module,exports){
+},{}],5:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -1118,5 +1112,5 @@
  * @param {object} [options.args.posts_per_page]
  */
-var Attachments = require( './attachments.js' ),
+var Attachments = wp.media.model.Attachments,
 	Query;
 
@@ -1408,6 +1402,6 @@
 module.exports = Query;
 
-},{"./attachments.js":3}],6:[function(require,module,exports){
-/*globals _ */
+},{}],6:[function(require,module,exports){
+/*globals wp, _ */
 
 /**
@@ -1420,5 +1414,5 @@
  * @augments Backbone.Collection
  */
-var Attachments = require( './attachments.js' ),
+var Attachments = wp.media.model.Attachments,
 	Selection;
 
@@ -1507,3 +1501,3 @@
 module.exports = Selection;
 
-},{"./attachments.js":3}]},{},[1]);
+},{}]},{},[1]);
Index: /trunk/src/wp-includes/js/media/models.manifest.js
===================================================================
--- /trunk/src/wp-includes/js/media/models.manifest.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/models.manifest.js	(revision 31935)
@@ -58,6 +58,6 @@
 delete l10n.settings;
 
+Attachment = media.model.Attachment = require( './models/attachment.js' );
 Attachments = media.model.Attachments = require( './models/attachments.js' );
-Attachment = media.model.Attachment = require( './models/attachment.js' );
 
 media.model.Query = require( './models/query.js' );
Index: /trunk/src/wp-includes/js/media/models/attachment.js
===================================================================
--- /trunk/src/wp-includes/js/media/models/attachment.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/models/attachment.js	(revision 31935)
@@ -146,5 +146,5 @@
 	 */
 	create: function( attrs ) {
-		var Attachments = require( './attachments.js' );
+		var Attachments = wp.media.model.Attachments;
 		return Attachments.all.push( attrs );
 	},
@@ -161,5 +161,5 @@
 	 */
 	get: _.memoize( function( id, attachment ) {
-		var Attachments = require( './attachments.js' );
+		var Attachments = wp.media.model.Attachments;
 		return Attachments.all.push( attachment || { id: id } );
 	})
Index: /trunk/src/wp-includes/js/media/models/attachments.js
===================================================================
--- /trunk/src/wp-includes/js/media/models/attachments.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/models/attachments.js	(revision 31935)
@@ -23,12 +23,9 @@
  *
  */
-var Attachment = require( './attachment.js' ),
-	Attachments;
-
-Attachments = Backbone.Collection.extend({
+var Attachments = Backbone.Collection.extend({
 	/**
 	 * @type {wp.media.model.Attachment}
 	 */
-	model: Attachment,
+	model: wp.media.model.Attachment,
 	/**
 	 * @param {Array} [models=[]] Array of models used to populate the collection.
@@ -368,5 +365,5 @@
 			}
 
-			attachment = Attachment.get( id );
+			attachment = wp.media.model.Attachment.get( id );
 			newAttributes = attachment.parse( attrs, xhr );
 
@@ -384,10 +381,9 @@
 	 */
 	_requery: function( refresh ) {
-		var props, Query;
+		var props;
 		if ( this.props.get('query') ) {
-			Query = require( './query.js' );
 			props = this.props.toJSON();
 			props.cache = ( true !== refresh );
-			this.mirror( Query.get( props ) );
+			this.mirror( wp.media.model.Query.get( props ) );
 		}
 	},
Index: /trunk/src/wp-includes/js/media/models/post-image.js
===================================================================
--- /trunk/src/wp-includes/js/media/models/post-image.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/models/post-image.js	(revision 31935)
@@ -14,10 +14,8 @@
  * @param {int} [attributes.attachment_id] ID of the attachment.
  **/
-var Attachment = require( './attachment' ),
-	PostImage;
-
-PostImage = Backbone.Model.extend({
+var PostImage = Backbone.Model.extend({
 
 	initialize: function( attributes ) {
+		var Attachment = wp.media.model.Attachment;
 		this.attachment = false;
 
Index: /trunk/src/wp-includes/js/media/models/query.js
===================================================================
--- /trunk/src/wp-includes/js/media/models/query.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/models/query.js	(revision 31935)
@@ -18,5 +18,5 @@
  * @param {object} [options.args.posts_per_page]
  */
-var Attachments = require( './attachments.js' ),
+var Attachments = wp.media.model.Attachments,
 	Query;
 
Index: /trunk/src/wp-includes/js/media/models/selection.js
===================================================================
--- /trunk/src/wp-includes/js/media/models/selection.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/models/selection.js	(revision 31935)
@@ -1,3 +1,3 @@
-/*globals _ */
+/*globals wp, _ */
 
 /**
@@ -10,5 +10,5 @@
  * @augments Backbone.Collection
  */
-var Attachments = require( './attachments.js' ),
+var Attachments = wp.media.model.Attachments,
 	Selection;
 
Index: /trunk/src/wp-includes/js/media/views.js
===================================================================
--- /trunk/src/wp-includes/js/media/views.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views.js	(revision 31935)
@@ -36,5 +36,5 @@
  */
 var Selection = wp.media.model.Selection,
-	Library = require( './library.js' ),
+	Library = wp.media.controller.Library,
 	CollectionAdd;
 
@@ -102,5 +102,5 @@
 module.exports = CollectionAdd;
 
-},{"./library.js":10}],2:[function(require,module,exports){
+},{}],2:[function(require,module,exports){
 /*globals wp, Backbone */
 
@@ -139,7 +139,5 @@
  * @param {string}                     attributes.collectionType         The collection type. (e.g. 'playlist').
  */
-var Library = require( './library.js' ),
-	View = require( '../views/view.js' ),
-	EditLibraryView = require( '../views/attachment/edit-library.js' ),
+var Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	$ = jQuery,
@@ -180,5 +178,5 @@
 		// The single `Attachment` view to be used in the `Attachments` view.
 		if ( ! this.get('AttachmentView') ) {
-			this.set( 'AttachmentView', EditLibraryView );
+			this.set( 'AttachmentView', wp.media.view.Attachment.EditLibrary );
 		}
 		Library.prototype.initialize.apply( this, arguments );
@@ -246,5 +244,5 @@
 
 		if ( dragInfoText ) {
-			attachmentsBrowserView.toolbar.set( 'dragInfo', new View({
+			attachmentsBrowserView.toolbar.set( 'dragInfo', new wp.media.View({
 				el: $( '<div class="instructions">' + dragInfoText + '</div>' )[0],
 				priority: -40
@@ -266,5 +264,5 @@
 module.exports = CollectionEdit;
 
-},{"../views/attachment/edit-library.js":25,"../views/view.js":71,"./library.js":10}],3:[function(require,module,exports){
+},{}],3:[function(require,module,exports){
 /*globals wp, _, Backbone */
 
@@ -278,11 +276,8 @@
  * @augments Backbone.Model
  */
-var State = require( './state.js' ),
-	ToolbarView = require( '../views/toolbar.js' ),
-	CropperView = require( '../views/cropper.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	Cropper;
 
-Cropper = State.extend({
+Cropper = wp.media.controller.State.extend({
 	defaults: {
 		id:          'cropper',
@@ -307,5 +302,5 @@
 
 	createCropContent: function() {
-		this.cropperView = new CropperView({
+		this.cropperView = new wp.media.view.Cropper({
 			controller: this,
 			attachment: this.get('selection').first()
@@ -373,5 +368,5 @@
 		}
 
-		this.frame.toolbar.set( new ToolbarView(toolbarOptions) );
+		this.frame.toolbar.set( new wp.media.view.Toolbar(toolbarOptions) );
 	},
 
@@ -387,5 +382,5 @@
 module.exports = Cropper;
 
-},{"../views/cropper.js":34,"../views/toolbar.js":63,"./state.js":15}],4:[function(require,module,exports){
+},{}],4:[function(require,module,exports){
 /*globals wp */
 
@@ -408,10 +403,8 @@
  * @param {string}                    [attributes.url]                Unused. @todo Consider removal.
  */
-var State = require( './state.js' ),
-	ToolbarView = require( '../views/toolbar.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	EditImage;
 
-EditImage = State.extend({
+EditImage = wp.media.controller.State.extend({
 	defaults: {
 		id:      'edit-image',
@@ -445,5 +438,5 @@
 			previous = lastState && lastState.id;
 
-		frame.toolbar.set( new ToolbarView({
+		frame.toolbar.set( new wp.media.view.Toolbar({
 			controller: frame,
 			items: {
@@ -467,5 +460,5 @@
 module.exports = EditImage;
 
-},{"../views/toolbar.js":63,"./state.js":15}],5:[function(require,module,exports){
+},{}],5:[function(require,module,exports){
 /*globals wp, _, Backbone */
 
@@ -491,10 +484,9 @@
  * @param {object} [attributes.metadata={}]           Properties of the embed, which will override attributes.url if set.
  */
-var State = require( './state.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	$ = Backbone.$,
 	Embed;
 
-Embed = State.extend({
+Embed = wp.media.controller.State.extend({
 	defaults: {
 		id:       'embed',
@@ -606,5 +598,5 @@
 module.exports = Embed;
 
-},{"./state.js":15}],6:[function(require,module,exports){
+},{}],6:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -641,5 +633,5 @@
  */
 var Attachment = wp.media.model.Attachment,
-	Library = require( './library.js' ),
+	Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	FeaturedImage;
@@ -730,5 +722,5 @@
 module.exports = FeaturedImage;
 
-},{"./library.js":10}],7:[function(require,module,exports){
+},{}],7:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -765,5 +757,5 @@
  */
 var Selection = wp.media.model.Selection,
-	Library = require( './library.js' ),
+	Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	GalleryAdd;
@@ -823,5 +815,5 @@
 module.exports = GalleryAdd;
 
-},{"./library.js":10}],8:[function(require,module,exports){
+},{}],8:[function(require,module,exports){
 /*globals wp */
 
@@ -857,7 +849,5 @@
  *                                                                        If none supplied, defaults to wp.media.view.Attachment.EditLibrary.
  */
-var Library = require( './library.js' ),
-	EditLibraryView = require( '../views/attachment/edit-library.js' ),
-	GallerySettingsView = require( '../views/settings/gallery.js' ),
+var Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	GalleryEdit;
@@ -893,5 +883,5 @@
 		// The single `Attachment` view to be used in the `Attachments` view.
 		if ( ! this.get('AttachmentView') ) {
-			this.set( 'AttachmentView', EditLibraryView );
+			this.set( 'AttachmentView', wp.media.view.Attachment.EditLibrary );
 		}
 
@@ -947,5 +937,5 @@
 
 		browser.sidebar.set({
-			gallery: new GallerySettingsView({
+			gallery: new wp.media.view.Settings.Gallery({
 				controller: this,
 				model:      library.gallery,
@@ -967,5 +957,5 @@
 module.exports = GalleryEdit;
 
-},{"../views/attachment/edit-library.js":25,"../views/settings/gallery.js":59,"./library.js":10}],9:[function(require,module,exports){
+},{}],9:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -994,6 +984,6 @@
  *       however this may not do anything.
  */
-var State = require( './state.js' ),
-	Library = require( './library.js' ),
+var State = wp.media.controller.State,
+	Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	ImageDetails;
@@ -1031,5 +1021,5 @@
 module.exports = ImageDetails;
 
-},{"./library.js":10,"./state.js":15}],10:[function(require,module,exports){
+},{}],10:[function(require,module,exports){
 /*globals wp, _, Backbone */
 
@@ -1068,12 +1058,10 @@
  * @param {boolean}                         [attributes.syncSelection=true]      Whether the Attachments selection should be persisted from the last state.
  */
-var selectionSync = require( '../utils/selection-sync.js' ),
-	State = require( './state.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	getUserSetting = window.getUserSetting,
 	setUserSetting = window.setUserSetting,
 	Library;
 
-Library = State.extend({
+Library = wp.media.controller.State.extend({
 	defaults: {
 		id:                 'library',
@@ -1303,9 +1291,9 @@
 
 // Make selectionSync available on any Media Library state.
-_.extend( Library.prototype, selectionSync );
+_.extend( Library.prototype, wp.media.selectionSync );
 
 module.exports = Library;
 
-},{"../utils/selection-sync.js":16,"./state.js":15}],11:[function(require,module,exports){
+},{}],11:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -1318,5 +1306,5 @@
  * @augments Backbone.Model
  */
-var Library = require( './library.js' ),
+var Library = wp.media.controller.Library,
 	MediaLibrary;
 
@@ -1359,5 +1347,5 @@
 module.exports = MediaLibrary;
 
-},{"./library.js":10}],12:[function(require,module,exports){
+},{}],12:[function(require,module,exports){
 /*globals Backbone, _ */
 
@@ -1574,5 +1562,5 @@
  * @param {boolean}                    [attributes.syncSelection=true]      Whether the Attachments selection should be persisted from the last state.
  */
-var Library = require( './library.js' ),
+var Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	ReplaceImage;
@@ -1650,5 +1638,5 @@
 module.exports = ReplaceImage;
 
-},{"./library.js":10}],14:[function(require,module,exports){
+},{}],14:[function(require,module,exports){
 /*globals _, Backbone */
 
@@ -2249,5 +2237,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
+var View = wp.media.View,
 	AttachmentCompat;
 
@@ -2323,5 +2311,5 @@
 module.exports = AttachmentCompat;
 
-},{"./view.js":71}],19:[function(require,module,exports){
+},{}],19:[function(require,module,exports){
 /*globals _, jQuery */
 
@@ -2334,9 +2322,8 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	$ = jQuery,
+var $ = jQuery,
 	AttachmentFilters;
 
-AttachmentFilters = View.extend({
+AttachmentFilters = wp.media.View.extend({
 	tagName:   'select',
 	className: 'attachment-filters',
@@ -2403,5 +2390,5 @@
 module.exports = AttachmentFilters;
 
-},{"./view.js":71}],20:[function(require,module,exports){
+},{}],20:[function(require,module,exports){
 /*globals wp */
 
@@ -2415,9 +2402,8 @@
  * @augments Backbone.View
  */
-var AttachmentFilters = require( '../attachment-filters.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	All;
 
-All = AttachmentFilters.extend({
+All = wp.media.view.AttachmentFilters.extend({
 	createFilters: function() {
 		var filters = {};
@@ -2496,5 +2482,5 @@
 module.exports = All;
 
-},{"../attachment-filters.js":19}],21:[function(require,module,exports){
+},{}],21:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -2508,9 +2494,8 @@
  * @augments Backbone.View
  */
-var AttachmentFilters = require( '../attachment-filters.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	DateFilter;
 
-DateFilter = AttachmentFilters.extend({
+DateFilter = wp.media.view.AttachmentFilters.extend({
 	id: 'media-attachment-date-filters',
 
@@ -2540,5 +2525,5 @@
 module.exports = DateFilter;
 
-},{"../attachment-filters.js":19}],22:[function(require,module,exports){
+},{}],22:[function(require,module,exports){
 /*globals wp */
 
@@ -2552,9 +2537,8 @@
  * @augments Backbone.View
  */
-var AttachmentFilters = require( '../attachment-filters.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	Uploaded;
 
-Uploaded = AttachmentFilters.extend({
+Uploaded = wp.media.view.AttachmentFilters.extend({
 	createFilters: function() {
 		var type = this.model.get('type'),
@@ -2602,5 +2586,5 @@
 module.exports = Uploaded;
 
-},{"../attachment-filters.js":19}],23:[function(require,module,exports){
+},{}],23:[function(require,module,exports){
 /*globals wp, _, jQuery */
 
@@ -2613,5 +2597,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
+var View = wp.media.View,
 	$ = jQuery,
 	Attachment;
@@ -3159,5 +3143,5 @@
 module.exports = Attachment;
 
-},{"./view.js":71}],24:[function(require,module,exports){
+},{}],24:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -3171,5 +3155,5 @@
  * @augments Backbone.View
  */
-var Attachment = require( '../attachment.js' ),
+var Attachment = wp.media.view.Attachment,
 	l10n = wp.media.view.l10n,
 	Details;
@@ -3316,5 +3300,7 @@
 module.exports = Details;
 
-},{"../attachment.js":23}],25:[function(require,module,exports){
+},{}],25:[function(require,module,exports){
+/*globals wp */
+
 /**
  * wp.media.view.Attachment.EditLibrary
@@ -3326,8 +3312,5 @@
  * @augments Backbone.View
  */
-var Attachment = require( '../attachment.js' ),
-	EditLibrary;
-
-EditLibrary = Attachment.extend({
+var EditLibrary = wp.media.view.Attachment.extend({
 	buttons: {
 		close: true
@@ -3337,5 +3320,7 @@
 module.exports = EditLibrary;
 
-},{"../attachment.js":23}],26:[function(require,module,exports){
+},{}],26:[function(require,module,exports){
+/*globals wp */
+
 /**
  * wp.media.view.Attachments.EditSelection
@@ -3348,8 +3333,5 @@
  * @augments Backbone.View
  */
-var Selection = require( './selection.js' ),
-	EditSelection;
-
-EditSelection = Selection.extend({
+var EditSelection = wp.media.view.Attachment.Selection.extend({
 	buttons: {
 		close: true
@@ -3359,5 +3341,7 @@
 module.exports = EditSelection;
 
-},{"./selection.js":28}],27:[function(require,module,exports){
+},{}],27:[function(require,module,exports){
+/*globals wp */
+
 /**
  * wp.media.view.Attachment.Library
@@ -3369,8 +3353,5 @@
  * @augments Backbone.View
  */
-var Attachment = require( '../attachment.js' ),
-	Library;
-
-Library = Attachment.extend({
+var Library = wp.media.view.Attachment.extend({
 	buttons: {
 		check: true
@@ -3380,5 +3361,7 @@
 module.exports = Library;
 
-},{"../attachment.js":23}],28:[function(require,module,exports){
+},{}],28:[function(require,module,exports){
+/*globals wp */
+
 /**
  * wp.media.view.Attachment.Selection
@@ -3390,8 +3373,5 @@
  * @augments Backbone.View
  */
-var Attachment = require( '../attachment.js' ),
-	Selection;
-
-Selection = Attachment.extend({
+var Selection = wp.media.view.Attachment.extend({
 	className: 'attachment selection',
 
@@ -3405,5 +3385,5 @@
 module.exports = Selection;
 
-},{"../attachment.js":23}],29:[function(require,module,exports){
+},{}],29:[function(require,module,exports){
 /*globals wp, _, jQuery */
 
@@ -3416,6 +3396,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	Attachment = require( './attachment.js' ),
+var View = wp.media.View,
 	$ = jQuery,
 	Attachments;
@@ -3435,5 +3414,5 @@
 			refreshSensitivity: wp.media.isTouchDevice ? 300 : 200,
 			refreshThreshold:   3,
-			AttachmentView:     Attachment,
+			AttachmentView:     wp.media.view.Attachment,
 			sortable:           false,
 			resize:             true,
@@ -3707,5 +3686,5 @@
 module.exports = Attachments;
 
-},{"./attachment.js":23,"./view.js":71}],30:[function(require,module,exports){
+},{}],30:[function(require,module,exports){
 /*globals wp, _, jQuery */
 
@@ -3730,20 +3709,5 @@
  *                                              Accepts true, false, and 'errors'.
  */
-var View = require( '../view.js' ),
-	Library = require( '../attachment/library.js' ),
-	Toolbar = require( '../toolbar.js' ),
-	Spinner = require( '../spinner.js' ),
-	Search = require( '../search.js' ),
-	Label = require( '../label.js' ),
-	Uploaded = require( '../attachment-filters/uploaded.js' ),
-	All = require( '../attachment-filters/all.js' ),
-	DateFilter = require( '../attachment-filters/date.js' ),
-	UploaderInline = require( '../uploader/inline.js' ),
-	Attachments = require( '../attachments.js' ),
-	Sidebar = require( '../sidebar.js' ),
-	UploaderStatus = require( '../uploader/status.js' ),
-	Details = require( '../attachment/details.js' ),
-	AttachmentCompat = require( '../attachment-compat.js' ),
-	AttachmentDisplay = require( '../settings/attachment-display.js' ),
+var View = wp.media.View,
 	mediaTrash = wp.media.view.settings.mediaTrash,
 	l10n = wp.media.view.l10n,
@@ -3762,5 +3726,5 @@
 			display: false,
 			sidebar: true,
-			AttachmentView: Library
+			AttachmentView: wp.media.view.Attachment.Library
 		});
 
@@ -3813,9 +3777,9 @@
 		* @member {wp.media.view.Toolbar}
 		*/
-		this.toolbar = new Toolbar( toolbarOptions );
+		this.toolbar = new wp.media.view.Toolbar( toolbarOptions );
 
 		this.views.add( this.toolbar );
 
-		this.toolbar.set( 'spinner', new Spinner({
+		this.toolbar.set( 'spinner', new wp.media.view.Spinner({
 			priority: -60
 		}) );
@@ -3824,5 +3788,5 @@
 			// "Filters" will return a <select>, need to render
 			// screen reader text before
-			this.toolbar.set( 'filtersLabel', new Label({
+			this.toolbar.set( 'filtersLabel', new wp.media.view.Label({
 				value: l10n.filterByType,
 				attributes: {
@@ -3833,5 +3797,5 @@
 
 			if ( 'uploaded' === this.options.filters ) {
-				this.toolbar.set( 'filters', new Uploaded({
+				this.toolbar.set( 'filters', new wp.media.view.AttachmentFilters.Uploaded({
 					controller: this.controller,
 					model:      this.collection.props,
@@ -3839,5 +3803,5 @@
 				}).render() );
 			} else {
-				Filters = new All({
+				Filters = new wp.media.view.AttachmentFilters.All({
 					controller: this.controller,
 					model:      this.collection.props,
@@ -3864,5 +3828,5 @@
 
 			// DateFilter is a <select>, screen reader text needs to be rendered before
-			this.toolbar.set( 'dateFilterLabel', new Label({
+			this.toolbar.set( 'dateFilterLabel', new wp.media.view.Label({
 				value: l10n.filterByDate,
 				attributes: {
@@ -3871,5 +3835,5 @@
 				priority: -75
 			}).render() );
-			this.toolbar.set( 'dateFilter', new DateFilter({
+			this.toolbar.set( 'dateFilter', new wp.media.view.DateFilter({
 				controller: this.controller,
 				model:      this.collection.props,
@@ -3975,5 +3939,5 @@
 		} else if ( this.options.date ) {
 			// DateFilter is a <select>, screen reader text needs to be rendered before
-			this.toolbar.set( 'dateFilterLabel', new Label({
+			this.toolbar.set( 'dateFilterLabel', new wp.media.view.Label({
 				value: l10n.filterByDate,
 				attributes: {
@@ -3982,5 +3946,5 @@
 				priority: -75
 			}).render() );
-			this.toolbar.set( 'dateFilter', new DateFilter({
+			this.toolbar.set( 'dateFilter', new wp.media.view.DateFilter({
 				controller: this.controller,
 				model:      this.collection.props,
@@ -3991,5 +3955,5 @@
 		if ( this.options.search ) {
 			// Search is an input, screen reader text needs to be rendered before
-			this.toolbar.set( 'searchLabel', new Label({
+			this.toolbar.set( 'searchLabel', new wp.media.view.Label({
 				value: l10n.searchMediaLabel,
 				attributes: {
@@ -3998,5 +3962,5 @@
 				priority:   60
 			}).render() );
-			this.toolbar.set( 'search', new Search({
+			this.toolbar.set( 'search', new wp.media.view.Search({
 				controller: this.controller,
 				model:      this.collection.props,
@@ -4047,5 +4011,5 @@
 
 	createUploader: function() {
-		this.uploader = new UploaderInline({
+		this.uploader = new wp.media.view.UploaderInline({
 			controller: this.controller,
 			status:     false,
@@ -4067,5 +4031,5 @@
 
 	createAttachments: function() {
-		this.attachments = new Attachments({
+		this.attachments = new wp.media.view.Attachments({
 			controller:           this.controller,
 			collection:           this.collection,
@@ -4103,5 +4067,5 @@
 		var options = this.options,
 			selection = options.selection,
-			sidebar = this.sidebar = new Sidebar({
+			sidebar = this.sidebar = new wp.media.view.Sidebar({
 				controller: this.controller
 			});
@@ -4110,5 +4074,5 @@
 
 		if ( this.controller.uploader ) {
-			sidebar.set( 'uploads', new UploaderStatus({
+			sidebar.set( 'uploads', new wp.media.view.UploaderStatus({
 				controller: this.controller,
 				priority:   40
@@ -4128,5 +4092,5 @@
 			single = this.options.selection.single();
 
-		sidebar.set( 'details', new Details({
+		sidebar.set( 'details', new wp.media.view.Attachment.Details({
 			controller: this.controller,
 			model:      single,
@@ -4134,5 +4098,5 @@
 		}) );
 
-		sidebar.set( 'compat', new AttachmentCompat({
+		sidebar.set( 'compat', new wp.media.view.AttachmentCompat({
 			controller: this.controller,
 			model:      single,
@@ -4141,5 +4105,5 @@
 
 		if ( this.options.display ) {
-			sidebar.set( 'display', new AttachmentDisplay({
+			sidebar.set( 'display', new wp.media.view.Settings.AttachmentDisplay({
 				controller:   this.controller,
 				model:        this.model.display( single ),
@@ -4168,6 +4132,6 @@
 module.exports = AttachmentsBrowser;
 
-},{"../attachment-compat.js":18,"../attachment-filters/all.js":20,"../attachment-filters/date.js":21,"../attachment-filters/uploaded.js":22,"../attachment/details.js":24,"../attachment/library.js":27,"../attachments.js":29,"../label.js":47,"../search.js":55,"../settings/attachment-display.js":58,"../sidebar.js":61,"../spinner.js":62,"../toolbar.js":63,"../uploader/inline.js":67,"../uploader/status.js":69,"../view.js":71}],31:[function(require,module,exports){
-/*globals _ */
+},{}],31:[function(require,module,exports){
+/*globals wp, _ */
 
 /**
@@ -4180,6 +4144,5 @@
  * @augments Backbone.View
  */
-var Attachments = require( '../attachments.js' ),
-	AttachmentSelection = require( '../attachment/selection.js' ),
+var Attachments = wp.media.view.Attachments,
 	Selection;
 
@@ -4192,5 +4155,5 @@
 
 			// The single `Attachment` view to be used in the `Attachments` view.
-			AttachmentView: AttachmentSelection
+			AttachmentView: wp.media.view.Attachment.Selection
 		});
 		// Call 'initialize' directly on the parent class.
@@ -4201,5 +4164,5 @@
 module.exports = Selection;
 
-},{"../attachment/selection.js":28,"../attachments.js":29}],32:[function(require,module,exports){
+},{}],32:[function(require,module,exports){
 /*globals _, Backbone */
 
@@ -4212,10 +4175,8 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	Button = require( './button.js' ),
-	$ = Backbone.$,
+var $ = Backbone.$,
 	ButtonGroup;
 
-ButtonGroup = View.extend({
+ButtonGroup = wp.media.View.extend({
 	tagName:   'div',
 	className: 'button-group button-large media-button-group',
@@ -4229,5 +4190,5 @@
 				return button;
 			} else {
-				return new Button( button ).render();
+				return new wp.media.view.Button( button ).render();
 			}
 		});
@@ -4251,5 +4212,5 @@
 module.exports = ButtonGroup;
 
-},{"./button.js":33,"./view.js":71}],33:[function(require,module,exports){
+},{}],33:[function(require,module,exports){
 /*globals _, Backbone */
 
@@ -4262,8 +4223,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	Button;
-
-Button = View.extend({
+var Button = wp.media.View.extend({
 	tagName:    'a',
 	className:  'media-button',
@@ -4342,5 +4300,5 @@
 module.exports = Button;
 
-},{"./view.js":71}],34:[function(require,module,exports){
+},{}],34:[function(require,module,exports){
 /*globals wp, _, jQuery */
 
@@ -4359,7 +4317,6 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	UploaderStatusError = require( './uploader/status-error.js' ),
-	UploaderStatus = require( './uploader/status.js' ),
+var View = wp.media.View,
+	UploaderStatus = wp.media.view.UploaderStatus,
 	l10n = wp.media.view.l10n,
 	$ = jQuery,
@@ -4403,5 +4360,5 @@
 		var filename = this.options.attachment.get('filename');
 
-		this.views.add( '.upload-errors', new UploaderStatusError({
+		this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
 			filename: UploaderStatus.prototype.filename(filename),
 			message: window._wpMediaViewsL10n.cropError
@@ -4412,5 +4369,5 @@
 module.exports = Cropper;
 
-},{"./uploader/status-error.js":68,"./uploader/status.js":69,"./view.js":71}],35:[function(require,module,exports){
+},{}],35:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -4423,5 +4380,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
+var View = wp.media.View,
 	EditImage;
 
@@ -4470,5 +4427,5 @@
 module.exports = EditImage;
 
-},{"./view.js":71}],36:[function(require,module,exports){
+},{}],36:[function(require,module,exports){
 /**
  * wp.media.view.Embed
@@ -4479,11 +4436,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	EmbedImage = require( './embed/image.js' ),
-	EmbedLink = require( './embed/link.js' ),
-	EmbedUrl = require( './embed/url.js' ),
-	Embed;
-
-Embed = View.extend({
+var Embed = wp.media.View.extend({
 	className: 'media-embed',
 
@@ -4492,5 +4443,5 @@
 		 * @member {wp.media.view.EmbedUrl}
 		 */
-		this.url = new EmbedUrl({
+		this.url = new wp.media.view.EmbedUrl({
 			controller: this.controller,
 			model:      this.model.props
@@ -4519,7 +4470,7 @@
 
 		if ( 'image' === type ) {
-			constructor = EmbedImage;
+			constructor = wp.media.view.EmbedImage;
 		} else if ( 'link' === type ) {
-			constructor = EmbedLink;
+			constructor = wp.media.view.EmbedLink;
 		} else {
 			return;
@@ -4540,5 +4491,5 @@
 module.exports = Embed;
 
-},{"./embed/image.js":37,"./embed/link.js":38,"./embed/url.js":39,"./view.js":71}],37:[function(require,module,exports){
+},{}],37:[function(require,module,exports){
 /*globals wp */
 
@@ -4553,5 +4504,5 @@
  * @augments Backbone.View
  */
-var AttachmentDisplay = require( '../settings/attachment-display.js' ),
+var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
 	EmbedImage;
 
@@ -4575,5 +4526,5 @@
 module.exports = EmbedImage;
 
-},{"../settings/attachment-display.js":58}],38:[function(require,module,exports){
+},{}],38:[function(require,module,exports){
 /*globals wp, _, jQuery */
 
@@ -4587,9 +4538,8 @@
  * @augments Backbone.View
  */
-var Settings = require( '../settings.js' ),
-	$ = jQuery,
+var $ = jQuery,
 	EmbedLink;
 
-EmbedLink = Settings.extend({
+EmbedLink = wp.media.view.Settings.extend({
 	className: 'embed-link-settings',
 	template:  wp.template('embed-link-settings'),
@@ -4682,5 +4632,5 @@
 module.exports = EmbedLink;
 
-},{"../settings.js":57}],39:[function(require,module,exports){
+},{}],39:[function(require,module,exports){
 /*globals wp, _, jQuery */
 
@@ -4693,5 +4643,5 @@
  * @augments Backbone.View
  */
-var View = require( '../view.js' ),
+var View = wp.media.View,
 	$ = jQuery,
 	EmbedUrl;
@@ -4763,5 +4713,5 @@
 module.exports = EmbedUrl;
 
-},{"../view.js":71}],40:[function(require,module,exports){
+},{}],40:[function(require,module,exports){
 /**
  * wp.media.view.FocusManager
@@ -4772,8 +4722,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	FocusManager;
-
-FocusManager = View.extend({
+var FocusManager = wp.media.View.extend({
 
 	events: {
@@ -4812,5 +4759,5 @@
 module.exports = FocusManager;
 
-},{"./view.js":71}],41:[function(require,module,exports){
+},{}],41:[function(require,module,exports){
 /*globals _, Backbone */
 
@@ -4830,11 +4777,5 @@
  * @mixes wp.media.controller.StateMachine
  */
-var StateMachine = require( '../controllers/state-machine.js' ),
-	State = require( '../controllers/state.js' ),
-	Region = require( '../controllers/region.js' ),
-	View = require( './view.js' ),
-	Frame;
-
-Frame = View.extend({
+var Frame = wp.media.View.extend({
 	initialize: function() {
 		_.defaults( this.options, {
@@ -4852,5 +4793,5 @@
 		// Initialize regions.
 		_.each( this.regions, function( region ) {
-			this[ region ] = new Region({
+			this[ region ] = new wp.media.controller.Region({
 				view:     this,
 				id:       region,
@@ -4870,5 +4811,5 @@
 		// Create the default `states` collection.
 		this.states = new Backbone.Collection( null, {
-			model: State
+			model: wp.media.controller.State
 		});
 
@@ -4982,9 +4923,9 @@
 
 // Make the `Frame` a `StateMachine`.
-_.extend( Frame.prototype, StateMachine.prototype );
+_.extend( Frame.prototype, wp.media.controller.StateMachine.prototype );
 
 module.exports = Frame;
 
-},{"../controllers/region.js":12,"../controllers/state-machine.js":14,"../controllers/state.js":15,"./view.js":71}],42:[function(require,module,exports){
+},{}],42:[function(require,module,exports){
 /*globals wp */
 
@@ -5004,11 +4945,5 @@
  * @mixes wp.media.controller.StateMachine
  */
-var Select = require( './select.js' ),
-	Toolbar = require( '../toolbar.js' ),
-	ImageDetailsController = require( '../../controllers/image-details.js' ),
-	ReplaceImageController = require( '../../controllers/replace-image.js' ),
-	EditImageController = require( '../../controllers/edit-image.js' ),
-	ImageDetailsView = require( '../image-details.js' ),
-	EditImageView = require( '../edit-image.js' ),
+var Select = wp.media.view.MediaFrame.Select,
 	l10n = wp.media.view.l10n,
 	ImageDetails;
@@ -5044,9 +4979,9 @@
 	createStates: function() {
 		this.states.add([
-			new ImageDetailsController({
+			new wp.media.controller.ImageDetails({
 				image: this.image,
 				editable: false
 			}),
-			new ReplaceImageController({
+			new wp.media.controller.ReplaceImage({
 				id: 'replace-image',
 				library: wp.media.query( { type: 'image' } ),
@@ -5058,5 +4993,5 @@
 				displaySettings: true
 			}),
-			new EditImageController( {
+			new wp.media.controller.EditImage( {
 				image: this.image,
 				selection: this.options.selection
@@ -5066,5 +5001,5 @@
 
 	imageDetailsContent: function( options ) {
-		options.view = new ImageDetailsView({
+		options.view = new wp.media.view.ImageDetails({
 			controller: this,
 			model: this.state().image,
@@ -5082,5 +5017,5 @@
 		}
 
-		view = new EditImageView( { model: model, controller: this } ).render();
+		view = new wp.media.view.EditImage( { model: model, controller: this } ).render();
 
 		this.content.set( view );
@@ -5092,5 +5027,5 @@
 
 	renderImageDetailsToolbar: function() {
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
@@ -5124,5 +5059,5 @@
 			previous = lastState && lastState.id;
 
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
@@ -5171,5 +5106,5 @@
 module.exports = ImageDetails;
 
-},{"../../controllers/edit-image.js":4,"../../controllers/image-details.js":9,"../../controllers/replace-image.js":13,"../edit-image.js":35,"../image-details.js":46,"../toolbar.js":63,"./select.js":44}],43:[function(require,module,exports){
+},{}],43:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -5188,22 +5123,6 @@
  * @mixes wp.media.controller.StateMachine
  */
-var View = require( '../view.js' ),
-	Select = require( './select.js' ),
-	Library = require( '../../controllers/library.js' ),
-	Embed = require( '../embed.js' ),
-	EditImage = require( '../edit-image.js' ),
-	EditSelection = require( '../attachment/edit-selection.js' ),
-	Toolbar = require( '../toolbar.js' ),
-	ToolbarEmbed = require( '../toolbar/embed.js' ),
-	PlaylistSettings = require( '../settings/playlist.js' ),
-	AttachmentsBrowser = require( '../attachments/browser.js' ),
-	SelectionView = require( '../selection.js' ),
-	EmbedController = require( '../../controllers/embed.js' ),
-	EditImageController = require( '../../controllers/edit-image.js' ),
-	GalleryEditController = require( '../../controllers/gallery-edit.js' ),
-	GalleryAddController = require( '../../controllers/gallery-add.js' ),
-	CollectionEditController = require( '../../controllers/collection-edit.js' ),
-	CollectionAddController = require( '../../controllers/collection-add.js' ),
-	FeaturedImageController = require( '../../controllers/featured-image.js' ),
+var Select = wp.media.view.MediaFrame.Select,
+	Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	Post;
@@ -5279,10 +5198,10 @@
 
 			// Embed states.
-			new EmbedController( { metadata: options.metadata } ),
-
-			new EditImageController( { model: options.editImage } ),
+			new wp.media.controller.Embed( { metadata: options.metadata } ),
+
+			new wp.media.controller.EditImage( { model: options.editImage } ),
 
 			// Gallery states.
-			new GalleryEditController({
+			new wp.media.controller.GalleryEdit({
 				library: options.selection,
 				editing: options.editing,
@@ -5290,5 +5209,5 @@
 			}),
 
-			new GalleryAddController(),
+			new wp.media.controller.GalleryAdd(),
 
 			new Library({
@@ -5307,9 +5226,9 @@
 
 			// Playlist states.
-			new CollectionEditController({
+			new wp.media.controller.CollectionEdit({
 				type: 'audio',
 				collectionType: 'playlist',
 				title:          l10n.editPlaylistTitle,
-				SettingsView:   PlaylistSettings,
+				SettingsView:   wp.media.view.Settings.Playlist,
 				library:        options.selection,
 				editing:        options.editing,
@@ -5319,5 +5238,5 @@
 			}),
 
-			new CollectionAddController({
+			new wp.media.controller.CollectionAdd({
 				type: 'audio',
 				collectionType: 'playlist',
@@ -5339,9 +5258,9 @@
 			}),
 
-			new CollectionEditController({
+			new wp.media.controller.CollectionEdit({
 				type: 'video',
 				collectionType: 'playlist',
 				title:          l10n.editVideoPlaylistTitle,
-				SettingsView:   PlaylistSettings,
+				SettingsView:   wp.media.view.Settings.Playlist,
 				library:        options.selection,
 				editing:        options.editing,
@@ -5351,5 +5270,5 @@
 			}),
 
-			new CollectionAddController({
+			new wp.media.controller.CollectionAdd({
 				type: 'video',
 				collectionType: 'playlist',
@@ -5359,5 +5278,5 @@
 
 		if ( wp.media.view.settings.post.featuredImageId ) {
-			this.states.add( new FeaturedImageController() );
+			this.states.add( new wp.media.controller.FeaturedImage() );
 		}
 	},
@@ -5446,5 +5365,5 @@
 	mainMenu: function( view ) {
 		view.set({
-			'library-separator': new View({
+			'library-separator': new wp.media.View({
 				className: 'separator',
 				priority: 100
@@ -5485,5 +5404,5 @@
 				}
 			},
-			separateCancel: new View({
+			separateCancel: new wp.media.View({
 				className: 'separator',
 				priority: 40
@@ -5509,5 +5428,5 @@
 				}
 			},
-			separateCancel: new View({
+			separateCancel: new wp.media.View({
 				className: 'separator',
 				priority: 40
@@ -5533,5 +5452,5 @@
 				}
 			},
-			separateCancel: new View({
+			separateCancel: new wp.media.View({
 				className: 'separator',
 				priority: 40
@@ -5542,5 +5461,5 @@
 	// Content
 	embedContent: function() {
-		var view = new Embed({
+		var view = new wp.media.view.Embed({
 			controller: this,
 			model:      this.state()
@@ -5559,5 +5478,5 @@
 			view;
 
-		view = new AttachmentsBrowser({
+		view = new wp.media.view.AttachmentsBrowser({
 			controller: this,
 			collection: selection,
@@ -5569,5 +5488,5 @@
 			dragInfo:   true,
 
-			AttachmentView: EditSelection
+			AttachmentView: wp.media.view.Attachments.EditSelection
 		}).render();
 
@@ -5590,5 +5509,5 @@
 	editImageContent: function() {
 		var image = this.state().get('image'),
-			view = new EditImage( { model: image, controller: this } ).render();
+			view = new wp.media.view.EditImage( { model: image, controller: this } ).render();
 
 		this.content.set( view );
@@ -5607,5 +5526,5 @@
 		var editable = this.state().get('editable');
 
-		view.set( 'selection', new SelectionView({
+		view.set( 'selection', new wp.media.view.Selection({
 			controller: this,
 			collection: this.state().get('selection'),
@@ -5748,5 +5667,5 @@
 
 	mainEmbedToolbar: function( toolbar ) {
-		toolbar.view = new ToolbarEmbed({
+		toolbar.view = new wp.media.view.Toolbar.Embed({
 			controller: this
 		});
@@ -5755,5 +5674,5 @@
 	galleryEditToolbar: function() {
 		var editing = this.state().get('editing');
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
@@ -5784,5 +5703,5 @@
 
 	galleryAddToolbar: function() {
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
@@ -5812,5 +5731,5 @@
 	playlistEditToolbar: function() {
 		var editing = this.state().get('editing');
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
@@ -5841,5 +5760,5 @@
 
 	playlistAddToolbar: function() {
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
@@ -5869,5 +5788,5 @@
 	videoPlaylistEditToolbar: function() {
 		var editing = this.state().get('editing');
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
@@ -5898,5 +5817,5 @@
 
 	videoPlaylistAddToolbar: function() {
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
@@ -5924,5 +5843,5 @@
 module.exports = Post;
 
-},{"../../controllers/collection-add.js":1,"../../controllers/collection-edit.js":2,"../../controllers/edit-image.js":4,"../../controllers/embed.js":5,"../../controllers/featured-image.js":6,"../../controllers/gallery-add.js":7,"../../controllers/gallery-edit.js":8,"../../controllers/library.js":10,"../attachment/edit-selection.js":26,"../attachments/browser.js":30,"../edit-image.js":35,"../embed.js":36,"../selection.js":56,"../settings/playlist.js":60,"../toolbar.js":63,"../toolbar/embed.js":64,"../view.js":71,"./select.js":44}],44:[function(require,module,exports){
+},{}],44:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -5941,9 +5860,5 @@
  */
 
-var MediaFrame = require( '../media-frame.js' ),
-	Library = require( '../../controllers/library.js' ),
-	AttachmentsBrowser = require( '../attachments/browser.js' ),
-	UploaderInline = require( '../uploader/inline.js' ),
-	ToolbarSelect = require( '../toolbar/select.js' ),
+var MediaFrame = wp.media.view.MediaFrame,
 	l10n = wp.media.view.l10n,
 	Select;
@@ -6003,5 +5918,5 @@
 		this.states.add([
 			// Main states.
-			new Library({
+			new wp.media.controller.Library({
 				library:   wp.media.query( options.library ),
 				multiple:  options.multiple,
@@ -6054,5 +5969,5 @@
 
 		// Browse our library of attachments.
-		contentRegion.view = new AttachmentsBrowser({
+		contentRegion.view = new wp.media.view.AttachmentsBrowser({
 			controller: this,
 			collection: state.get('library'),
@@ -6078,5 +5993,5 @@
 	uploadContent: function() {
 		this.$el.removeClass( 'hide-toolbar' );
-		this.content.set( new UploaderInline({
+		this.content.set( new wp.media.view.UploaderInline({
 			controller: this
 		}) );
@@ -6094,5 +6009,5 @@
 		options.controller = this;
 
-		toolbar.view = new ToolbarSelect( options );
+		toolbar.view = new wp.media.view.Toolbar.Select( options );
 	}
 });
@@ -6100,5 +6015,5 @@
 module.exports = Select;
 
-},{"../../controllers/library.js":10,"../attachments/browser.js":30,"../media-frame.js":48,"../toolbar/select.js":65,"../uploader/inline.js":67}],45:[function(require,module,exports){
+},{}],45:[function(require,module,exports){
 /**
  * wp.media.view.Iframe
@@ -6109,8 +6024,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	Iframe;
-
-Iframe = View.extend({
+var Iframe = wp.media.View.extend({
 	className: 'media-iframe',
 	/**
@@ -6127,5 +6039,5 @@
 module.exports = Iframe;
 
-},{"./view.js":71}],46:[function(require,module,exports){
+},{}],46:[function(require,module,exports){
 /*globals wp, _, jQuery */
 
@@ -6140,5 +6052,5 @@
  * @augments Backbone.View
  */
-var AttachmentDisplay = require( './settings/attachment-display.js' ),
+var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
 	$ = jQuery,
 	ImageDetails;
@@ -6297,5 +6209,5 @@
 module.exports = ImageDetails;
 
-},{"./settings/attachment-display.js":58}],47:[function(require,module,exports){
+},{}],47:[function(require,module,exports){
 /**
  * wp.media.view.Label
@@ -6306,8 +6218,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	Label;
-
-Label = View.extend({
+var Label = wp.media.View.extend({
 	tagName: 'label',
 	className: 'screen-reader-text',
@@ -6326,5 +6235,5 @@
 module.exports = Label;
 
-},{"./view.js":71}],48:[function(require,module,exports){
+},{}],48:[function(require,module,exports){
 /*globals wp, _, jQuery */
 
@@ -6341,12 +6250,5 @@
  * @mixes wp.media.controller.StateMachine
  */
-var View = require( './view.js' ),
-	Frame = require( './frame.js' ),
-	Modal = require( './modal.js' ),
-	UploaderWindow = require( './uploader/window.js' ),
-	Menu = require( './menu.js' ),
-	Toolbar = require( './toolbar.js' ),
-	Router = require( './router.js' ),
-	Iframe = require( './iframe.js' ),
+var Frame = wp.media.view.Frame,
 	$ = jQuery,
 	MediaFrame;
@@ -6378,5 +6280,5 @@
 		// Initialize modal container view.
 		if ( this.options.modal ) {
-			this.modal = new Modal({
+			this.modal = new wp.media.view.Modal({
 				controller: this,
 				title:      this.options.title
@@ -6394,5 +6296,5 @@
 		// Initialize window-wide uploader.
 		if ( this.options.uploader ) {
-			this.uploader = new UploaderWindow({
+			this.uploader = new wp.media.view.UploaderWindow({
 				controller: this,
 				uploader: {
@@ -6435,5 +6337,5 @@
 	 */
 	createTitle: function( title ) {
-		title.view = new View({
+		title.view = new wp.media.View({
 			controller: this,
 			tagName: 'h1'
@@ -6445,5 +6347,5 @@
 	 */
 	createMenu: function( menu ) {
-		menu.view = new Menu({
+		menu.view = new wp.media.view.Menu({
 			controller: this
 		});
@@ -6459,5 +6361,5 @@
 	 */
 	createToolbar: function( toolbar ) {
-		toolbar.view = new Toolbar({
+		toolbar.view = new wp.media.view.Toolbar({
 			controller: this
 		});
@@ -6468,5 +6370,5 @@
 	 */
 	createRouter: function( router ) {
-		router.view = new Router({
+		router.view = new wp.media.view.Router({
 			controller: this
 		});
@@ -6515,5 +6417,5 @@
 	iframeContent: function( content ) {
 		this.$el.addClass('hide-toolbar');
-		content.view = new Iframe({
+		content.view = new wp.media.view.Iframe({
 			controller: this
 		});
@@ -6582,5 +6484,5 @@
 module.exports = MediaFrame;
 
-},{"./frame.js":41,"./iframe.js":45,"./menu.js":50,"./modal.js":51,"./router.js":54,"./toolbar.js":63,"./uploader/window.js":70,"./view.js":71}],49:[function(require,module,exports){
+},{}],49:[function(require,module,exports){
 /*globals jQuery */
 
@@ -6593,9 +6495,8 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	$ = jQuery,
+var $ = jQuery,
 	MenuItem;
 
-MenuItem = View.extend({
+MenuItem = wp.media.View.extend({
 	tagName:   'a',
 	className: 'media-menu-item',
@@ -6657,5 +6558,5 @@
 module.exports = MenuItem;
 
-},{"./view.js":71}],50:[function(require,module,exports){
+},{}],50:[function(require,module,exports){
 /**
  * wp.media.view.Menu
@@ -6667,6 +6568,6 @@
  * @augments Backbone.View
  */
-var MenuItem = require( './menu-item.js' ),
-	PriorityList = require( './priority-list.js' ),
+var MenuItem = wp.media.view.MenuItem,
+	PriorityList = wp.media.view.PriorityList,
 	Menu;
 
@@ -6774,5 +6675,5 @@
 module.exports = Menu;
 
-},{"./menu-item.js":49,"./priority-list.js":52}],51:[function(require,module,exports){
+},{}],51:[function(require,module,exports){
 /*globals wp, _, jQuery */
 
@@ -6787,10 +6688,8 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	FocusManager = require( './focus-manager.js' ),
-	$ = jQuery,
+var $ = jQuery,
 	Modal;
 
-Modal = View.extend({
+Modal = wp.media.View.extend({
 	tagName:  'div',
 	template: wp.template('media-modal'),
@@ -6813,5 +6712,5 @@
 		});
 
-		this.focusManager = new FocusManager({
+		this.focusManager = new wp.media.view.FocusManager({
 			el: this.el
 		});
@@ -6991,5 +6890,5 @@
 module.exports = Modal;
 
-},{"./focus-manager.js":40,"./view.js":71}],52:[function(require,module,exports){
+},{}],52:[function(require,module,exports){
 /*globals _, Backbone */
 
@@ -7002,8 +6901,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	PriorityList;
-
-PriorityList = View.extend({
+var PriorityList = wp.media.View.extend({
 	tagName:   'div',
 
@@ -7087,5 +6983,5 @@
 	 */
 	toView: function( options ) {
-		return new View( options );
+		return new wp.media.View( options );
 	}
 });
@@ -7093,5 +6989,5 @@
 module.exports = PriorityList;
 
-},{"./view.js":71}],53:[function(require,module,exports){
+},{}],53:[function(require,module,exports){
 /**
  * wp.media.view.RouterItem
@@ -7103,8 +6999,5 @@
  * @augments Backbone.View
  */
-var MenuItem = require( './menu-item.js' ),
-	RouterItem;
-
-RouterItem = MenuItem.extend({
+var RouterItem = wp.media.view.MenuItem.extend({
 	/**
 	 * On click handler to activate the content region's corresponding mode.
@@ -7120,5 +7013,7 @@
 module.exports = RouterItem;
 
-},{"./menu-item.js":49}],54:[function(require,module,exports){
+},{}],54:[function(require,module,exports){
+/*globals wp */
+
 /**
  * wp.media.view.Router
@@ -7131,6 +7026,5 @@
  * @augments Backbone.View
  */
-var Menu = require( './menu.js' ),
-	RouterItem = require( './router-item.js' ),
+var Menu = wp.media.view.Menu,
 	Router;
 
@@ -7139,5 +7033,5 @@
 	className: 'media-router',
 	property:  'contentMode',
-	ItemView:  RouterItem,
+	ItemView:  wp.media.view.RouterItem,
 	region:    'router',
 
@@ -7158,5 +7052,5 @@
 module.exports = Router;
 
-},{"./menu.js":50,"./router-item.js":53}],55:[function(require,module,exports){
+},{}],55:[function(require,module,exports){
 /*globals wp */
 
@@ -7169,9 +7063,8 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	Search;
 
-Search = View.extend({
+Search = wp.media.View.extend({
 	tagName:   'input',
 	className: 'search',
@@ -7209,5 +7102,5 @@
 module.exports = Search;
 
-},{"./view.js":71}],56:[function(require,module,exports){
+},{}],56:[function(require,module,exports){
 /*globals wp, _, Backbone */
 
@@ -7220,10 +7113,8 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	AttachmentsSelection = require( './attachments/selection.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	Selection;
 
-Selection = View.extend({
+Selection = wp.media.View.extend({
 	tagName:   'div',
 	className: 'media-selection',
@@ -7244,5 +7135,5 @@
 		 * @member {wp.media.view.Attachments.Selection}
 		 */
-		this.attachments = new AttachmentsSelection({
+		this.attachments = new wp.media.view.Attachments.Selection({
 			controller: this.controller,
 			collection: this.collection,
@@ -7296,5 +7187,5 @@
 module.exports = Selection;
 
-},{"./attachments/selection.js":31,"./view.js":71}],57:[function(require,module,exports){
+},{}],57:[function(require,module,exports){
 /*globals _, Backbone */
 
@@ -7307,5 +7198,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
+var View = wp.media.View,
 	$ = Backbone.$,
 	Settings;
@@ -7419,5 +7310,5 @@
 module.exports = Settings;
 
-},{"./view.js":71}],58:[function(require,module,exports){
+},{}],58:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -7431,5 +7322,5 @@
  * @augments Backbone.View
  */
-var Settings = require( '../settings.js' ),
+var Settings = wp.media.view.Settings,
 	AttachmentDisplay;
 
@@ -7515,5 +7406,5 @@
 module.exports = AttachmentDisplay;
 
-},{"../settings.js":57}],59:[function(require,module,exports){
+},{}],59:[function(require,module,exports){
 /*globals wp */
 
@@ -7527,8 +7418,5 @@
  * @augments Backbone.View
  */
-var Settings = require( '../settings.js' ),
-	Gallery;
-
-Gallery = Settings.extend({
+var Gallery = wp.media.view.Settings.extend({
 	className: 'collection-settings gallery-settings',
 	template:  wp.template('gallery-settings')
@@ -7537,5 +7425,5 @@
 module.exports = Gallery;
 
-},{"../settings.js":57}],60:[function(require,module,exports){
+},{}],60:[function(require,module,exports){
 /*globals wp */
 
@@ -7549,8 +7437,5 @@
  * @augments Backbone.View
  */
-var Settings = require( '../settings.js' ),
-	Playlist;
-
-Playlist = Settings.extend({
+var Playlist = wp.media.view.Settings.extend({
 	className: 'collection-settings playlist-settings',
 	template:  wp.template('playlist-settings')
@@ -7559,5 +7444,5 @@
 module.exports = Playlist;
 
-},{"../settings.js":57}],61:[function(require,module,exports){
+},{}],61:[function(require,module,exports){
 /**
  * wp.media.view.Sidebar
@@ -7569,8 +7454,5 @@
  * @augments Backbone.View
  */
-var PriorityList = require( './priority-list.js' ),
-	Sidebar;
-
-Sidebar = PriorityList.extend({
+var Sidebar = wp.media.view.PriorityList.extend({
 	className: 'media-sidebar'
 });
@@ -7578,5 +7460,5 @@
 module.exports = Sidebar;
 
-},{"./priority-list.js":52}],62:[function(require,module,exports){
+},{}],62:[function(require,module,exports){
 /*globals _ */
 
@@ -7589,8 +7471,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	Spinner;
-
-Spinner = View.extend({
+var Spinner = wp.media.View.extend({
 	tagName:   'span',
 	className: 'spinner',
@@ -7618,5 +7497,5 @@
 module.exports = Spinner;
 
-},{"./view.js":71}],63:[function(require,module,exports){
+},{}],63:[function(require,module,exports){
 /*globals _, Backbone */
 
@@ -7632,7 +7511,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	Button = require( './button.js' ),
-	PriorityList = require( './priority-list.js' ),
+var View = wp.media.View,
 	Toolbar;
 
@@ -7649,6 +7526,6 @@
 
 		// The toolbar is composed of two `PriorityList` views.
-		this.primary   = new PriorityList();
-		this.secondary = new PriorityList();
+		this.primary   = new wp.media.view.PriorityList();
+		this.secondary = new wp.media.view.PriorityList();
 		this.primary.$el.addClass('media-toolbar-primary search-form');
 		this.secondary.$el.addClass('media-toolbar-secondary');
@@ -7712,5 +7589,5 @@
 			if ( ! ( view instanceof Backbone.View ) ) {
 				view.classes = [ 'media-button-' + id ].concat( view.classes || [] );
-				view = new Button( view ).render();
+				view = new wp.media.view.Button( view ).render();
 			}
 
@@ -7782,5 +7659,5 @@
 module.exports = Toolbar;
 
-},{"./button.js":33,"./priority-list.js":52,"./view.js":71}],64:[function(require,module,exports){
+},{}],64:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -7795,5 +7672,5 @@
  * @augments Backbone.View
  */
-var Select = require( './select.js' ),
+var Select = wp.media.view.Toolbar.Select,
 	l10n = wp.media.view.l10n,
 	Embed;
@@ -7821,5 +7698,5 @@
 module.exports = Embed;
 
-},{"./select.js":65}],65:[function(require,module,exports){
+},{}],65:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -7833,5 +7710,5 @@
  * @augments Backbone.View
  */
-var Toolbar = require( '../toolbar.js' ),
+var Toolbar = wp.media.view.Toolbar,
 	l10n = wp.media.view.l10n,
 	Select;
@@ -7893,5 +7770,5 @@
 module.exports = Select;
 
-},{"../toolbar.js":63}],66:[function(require,module,exports){
+},{}],66:[function(require,module,exports){
 /*globals wp, _, jQuery */
 
@@ -7907,5 +7784,5 @@
  * @augments Backbone.View
  */
-var View = require( '../view.js' ),
+var View = wp.media.View,
 	l10n = wp.media.view.l10n,
 	$ = jQuery,
@@ -8114,5 +7991,5 @@
 module.exports = EditorUploader;
 
-},{"../view.js":71}],67:[function(require,module,exports){
+},{}],67:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -8127,6 +8004,5 @@
  * @augments Backbone.View
  */
-var View = require( '../view.js' ),
-	UploaderStatus = require( './status.js' ),
+var View = wp.media.View,
 	UploaderInline;
 
@@ -8156,5 +8032,5 @@
 
 		if ( this.options.status ) {
-			this.views.set( '.upload-inline-status', new UploaderStatus({
+			this.views.set( '.upload-inline-status', new wp.media.view.UploaderStatus({
 				controller: this.controller
 			}) );
@@ -8248,5 +8124,5 @@
 module.exports = UploaderInline;
 
-},{"../view.js":71,"./status.js":69}],68:[function(require,module,exports){
+},{}],68:[function(require,module,exports){
 /*globals wp */
 
@@ -8259,8 +8135,5 @@
  * @augments Backbone.View
  */
-var View = require( '../view.js' ),
-	UploaderStatusError;
-
-UploaderStatusError = View.extend({
+var UploaderStatusError = wp.media.View.extend({
 	className: 'upload-error',
 	template:  wp.template('uploader-status-error')
@@ -8269,5 +8142,5 @@
 module.exports = UploaderStatusError;
 
-},{"../view.js":71}],69:[function(require,module,exports){
+},{}],69:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -8282,6 +8155,5 @@
  * @augments Backbone.View
  */
-var View = require( '../view.js' ),
-	UploaderStatusError = require( './status-error.js' ),
+var View = wp.media.View,
 	UploaderStatus;
 
@@ -8385,5 +8257,5 @@
 	 */
 	error: function( error ) {
-		this.views.add( '.upload-errors', new UploaderStatusError({
+		this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
 			filename: this.filename( error.get('file').name ),
 			message:  error.get('message')
@@ -8410,5 +8282,5 @@
 module.exports = UploaderStatus;
 
-},{"../view.js":71,"./status-error.js":68}],70:[function(require,module,exports){
+},{}],70:[function(require,module,exports){
 /*globals wp, _, jQuery */
 
@@ -8429,9 +8301,8 @@
  * @param {object} [options.uploader.params]
  */
-var View = require( '../view.js' ),
-	$ = jQuery,
+var $ = jQuery,
 	UploaderWindow;
 
-UploaderWindow = View.extend({
+UploaderWindow = wp.media.View.extend({
 	tagName:   'div',
 	className: 'uploader-window',
@@ -8524,5 +8395,5 @@
 module.exports = UploaderWindow;
 
-},{"../view.js":71}],71:[function(require,module,exports){
+},{}],71:[function(require,module,exports){
 /*globals wp */
 
Index: /trunk/src/wp-includes/js/media/views/attachment-compat.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/attachment-compat.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/attachment-compat.js	(revision 31935)
@@ -11,5 +11,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
+var View = wp.media.View,
 	AttachmentCompat;
 
Index: /trunk/src/wp-includes/js/media/views/attachment-filters.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/attachment-filters.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/attachment-filters.js	(revision 31935)
@@ -9,9 +9,8 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	$ = jQuery,
+var $ = jQuery,
 	AttachmentFilters;
 
-AttachmentFilters = View.extend({
+AttachmentFilters = wp.media.View.extend({
 	tagName:   'select',
 	className: 'attachment-filters',
Index: /trunk/src/wp-includes/js/media/views/attachment-filters/all.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/attachment-filters/all.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/attachment-filters/all.js	(revision 31935)
@@ -10,9 +10,8 @@
  * @augments Backbone.View
  */
-var AttachmentFilters = require( '../attachment-filters.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	All;
 
-All = AttachmentFilters.extend({
+All = wp.media.view.AttachmentFilters.extend({
 	createFilters: function() {
 		var filters = {};
Index: /trunk/src/wp-includes/js/media/views/attachment-filters/date.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/attachment-filters/date.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/attachment-filters/date.js	(revision 31935)
@@ -10,9 +10,8 @@
  * @augments Backbone.View
  */
-var AttachmentFilters = require( '../attachment-filters.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	DateFilter;
 
-DateFilter = AttachmentFilters.extend({
+DateFilter = wp.media.view.AttachmentFilters.extend({
 	id: 'media-attachment-date-filters',
 
Index: /trunk/src/wp-includes/js/media/views/attachment-filters/uploaded.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/attachment-filters/uploaded.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/attachment-filters/uploaded.js	(revision 31935)
@@ -10,9 +10,8 @@
  * @augments Backbone.View
  */
-var AttachmentFilters = require( '../attachment-filters.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	Uploaded;
 
-Uploaded = AttachmentFilters.extend({
+Uploaded = wp.media.view.AttachmentFilters.extend({
 	createFilters: function() {
 		var type = this.model.get('type'),
Index: /trunk/src/wp-includes/js/media/views/attachment.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/attachment.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/attachment.js	(revision 31935)
@@ -9,5 +9,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
+var View = wp.media.View,
 	$ = jQuery,
 	Attachment;
Index: /trunk/src/wp-includes/js/media/views/attachment/details.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/attachment/details.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/attachment/details.js	(revision 31935)
@@ -10,5 +10,5 @@
  * @augments Backbone.View
  */
-var Attachment = require( '../attachment.js' ),
+var Attachment = wp.media.view.Attachment,
 	l10n = wp.media.view.l10n,
 	Details;
Index: /trunk/src/wp-includes/js/media/views/attachment/edit-library.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/attachment/edit-library.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/attachment/edit-library.js	(revision 31935)
@@ -1,2 +1,4 @@
+/*globals wp */
+
 /**
  * wp.media.view.Attachment.EditLibrary
@@ -8,8 +10,5 @@
  * @augments Backbone.View
  */
-var Attachment = require( '../attachment.js' ),
-	EditLibrary;
-
-EditLibrary = Attachment.extend({
+var EditLibrary = wp.media.view.Attachment.extend({
 	buttons: {
 		close: true
Index: /trunk/src/wp-includes/js/media/views/attachment/edit-selection.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/attachment/edit-selection.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/attachment/edit-selection.js	(revision 31935)
@@ -1,2 +1,4 @@
+/*globals wp */
+
 /**
  * wp.media.view.Attachments.EditSelection
@@ -9,8 +11,5 @@
  * @augments Backbone.View
  */
-var Selection = require( './selection.js' ),
-	EditSelection;
-
-EditSelection = Selection.extend({
+var EditSelection = wp.media.view.Attachment.Selection.extend({
 	buttons: {
 		close: true
Index: /trunk/src/wp-includes/js/media/views/attachment/library.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/attachment/library.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/attachment/library.js	(revision 31935)
@@ -1,2 +1,4 @@
+/*globals wp */
+
 /**
  * wp.media.view.Attachment.Library
@@ -8,8 +10,5 @@
  * @augments Backbone.View
  */
-var Attachment = require( '../attachment.js' ),
-	Library;
-
-Library = Attachment.extend({
+var Library = wp.media.view.Attachment.extend({
 	buttons: {
 		check: true
Index: /trunk/src/wp-includes/js/media/views/attachment/selection.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/attachment/selection.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/attachment/selection.js	(revision 31935)
@@ -1,2 +1,4 @@
+/*globals wp */
+
 /**
  * wp.media.view.Attachment.Selection
@@ -8,8 +10,5 @@
  * @augments Backbone.View
  */
-var Attachment = require( '../attachment.js' ),
-	Selection;
-
-Selection = Attachment.extend({
+var Selection = wp.media.view.Attachment.extend({
 	className: 'attachment selection',
 
Index: /trunk/src/wp-includes/js/media/views/attachments.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/attachments.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/attachments.js	(revision 31935)
@@ -9,6 +9,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	Attachment = require( './attachment.js' ),
+var View = wp.media.View,
 	$ = jQuery,
 	Attachments;
@@ -28,5 +27,5 @@
 			refreshSensitivity: wp.media.isTouchDevice ? 300 : 200,
 			refreshThreshold:   3,
-			AttachmentView:     Attachment,
+			AttachmentView:     wp.media.view.Attachment,
 			sortable:           false,
 			resize:             true,
Index: /trunk/src/wp-includes/js/media/views/attachments/browser.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/attachments/browser.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/attachments/browser.js	(revision 31935)
@@ -21,20 +21,5 @@
  *                                              Accepts true, false, and 'errors'.
  */
-var View = require( '../view.js' ),
-	Library = require( '../attachment/library.js' ),
-	Toolbar = require( '../toolbar.js' ),
-	Spinner = require( '../spinner.js' ),
-	Search = require( '../search.js' ),
-	Label = require( '../label.js' ),
-	Uploaded = require( '../attachment-filters/uploaded.js' ),
-	All = require( '../attachment-filters/all.js' ),
-	DateFilter = require( '../attachment-filters/date.js' ),
-	UploaderInline = require( '../uploader/inline.js' ),
-	Attachments = require( '../attachments.js' ),
-	Sidebar = require( '../sidebar.js' ),
-	UploaderStatus = require( '../uploader/status.js' ),
-	Details = require( '../attachment/details.js' ),
-	AttachmentCompat = require( '../attachment-compat.js' ),
-	AttachmentDisplay = require( '../settings/attachment-display.js' ),
+var View = wp.media.View,
 	mediaTrash = wp.media.view.settings.mediaTrash,
 	l10n = wp.media.view.l10n,
@@ -53,5 +38,5 @@
 			display: false,
 			sidebar: true,
-			AttachmentView: Library
+			AttachmentView: wp.media.view.Attachment.Library
 		});
 
@@ -104,9 +89,9 @@
 		* @member {wp.media.view.Toolbar}
 		*/
-		this.toolbar = new Toolbar( toolbarOptions );
+		this.toolbar = new wp.media.view.Toolbar( toolbarOptions );
 
 		this.views.add( this.toolbar );
 
-		this.toolbar.set( 'spinner', new Spinner({
+		this.toolbar.set( 'spinner', new wp.media.view.Spinner({
 			priority: -60
 		}) );
@@ -115,5 +100,5 @@
 			// "Filters" will return a <select>, need to render
 			// screen reader text before
-			this.toolbar.set( 'filtersLabel', new Label({
+			this.toolbar.set( 'filtersLabel', new wp.media.view.Label({
 				value: l10n.filterByType,
 				attributes: {
@@ -124,5 +109,5 @@
 
 			if ( 'uploaded' === this.options.filters ) {
-				this.toolbar.set( 'filters', new Uploaded({
+				this.toolbar.set( 'filters', new wp.media.view.AttachmentFilters.Uploaded({
 					controller: this.controller,
 					model:      this.collection.props,
@@ -130,5 +115,5 @@
 				}).render() );
 			} else {
-				Filters = new All({
+				Filters = new wp.media.view.AttachmentFilters.All({
 					controller: this.controller,
 					model:      this.collection.props,
@@ -155,5 +140,5 @@
 
 			// DateFilter is a <select>, screen reader text needs to be rendered before
-			this.toolbar.set( 'dateFilterLabel', new Label({
+			this.toolbar.set( 'dateFilterLabel', new wp.media.view.Label({
 				value: l10n.filterByDate,
 				attributes: {
@@ -162,5 +147,5 @@
 				priority: -75
 			}).render() );
-			this.toolbar.set( 'dateFilter', new DateFilter({
+			this.toolbar.set( 'dateFilter', new wp.media.view.DateFilter({
 				controller: this.controller,
 				model:      this.collection.props,
@@ -266,5 +251,5 @@
 		} else if ( this.options.date ) {
 			// DateFilter is a <select>, screen reader text needs to be rendered before
-			this.toolbar.set( 'dateFilterLabel', new Label({
+			this.toolbar.set( 'dateFilterLabel', new wp.media.view.Label({
 				value: l10n.filterByDate,
 				attributes: {
@@ -273,5 +258,5 @@
 				priority: -75
 			}).render() );
-			this.toolbar.set( 'dateFilter', new DateFilter({
+			this.toolbar.set( 'dateFilter', new wp.media.view.DateFilter({
 				controller: this.controller,
 				model:      this.collection.props,
@@ -282,5 +267,5 @@
 		if ( this.options.search ) {
 			// Search is an input, screen reader text needs to be rendered before
-			this.toolbar.set( 'searchLabel', new Label({
+			this.toolbar.set( 'searchLabel', new wp.media.view.Label({
 				value: l10n.searchMediaLabel,
 				attributes: {
@@ -289,5 +274,5 @@
 				priority:   60
 			}).render() );
-			this.toolbar.set( 'search', new Search({
+			this.toolbar.set( 'search', new wp.media.view.Search({
 				controller: this.controller,
 				model:      this.collection.props,
@@ -338,5 +323,5 @@
 
 	createUploader: function() {
-		this.uploader = new UploaderInline({
+		this.uploader = new wp.media.view.UploaderInline({
 			controller: this.controller,
 			status:     false,
@@ -358,5 +343,5 @@
 
 	createAttachments: function() {
-		this.attachments = new Attachments({
+		this.attachments = new wp.media.view.Attachments({
 			controller:           this.controller,
 			collection:           this.collection,
@@ -394,5 +379,5 @@
 		var options = this.options,
 			selection = options.selection,
-			sidebar = this.sidebar = new Sidebar({
+			sidebar = this.sidebar = new wp.media.view.Sidebar({
 				controller: this.controller
 			});
@@ -401,5 +386,5 @@
 
 		if ( this.controller.uploader ) {
-			sidebar.set( 'uploads', new UploaderStatus({
+			sidebar.set( 'uploads', new wp.media.view.UploaderStatus({
 				controller: this.controller,
 				priority:   40
@@ -419,5 +404,5 @@
 			single = this.options.selection.single();
 
-		sidebar.set( 'details', new Details({
+		sidebar.set( 'details', new wp.media.view.Attachment.Details({
 			controller: this.controller,
 			model:      single,
@@ -425,5 +410,5 @@
 		}) );
 
-		sidebar.set( 'compat', new AttachmentCompat({
+		sidebar.set( 'compat', new wp.media.view.AttachmentCompat({
 			controller: this.controller,
 			model:      single,
@@ -432,5 +417,5 @@
 
 		if ( this.options.display ) {
-			sidebar.set( 'display', new AttachmentDisplay({
+			sidebar.set( 'display', new wp.media.view.Settings.AttachmentDisplay({
 				controller:   this.controller,
 				model:        this.model.display( single ),
Index: /trunk/src/wp-includes/js/media/views/attachments/selection.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/attachments/selection.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/attachments/selection.js	(revision 31935)
@@ -1,3 +1,3 @@
-/*globals _ */
+/*globals wp, _ */
 
 /**
@@ -10,6 +10,5 @@
  * @augments Backbone.View
  */
-var Attachments = require( '../attachments.js' ),
-	AttachmentSelection = require( '../attachment/selection.js' ),
+var Attachments = wp.media.view.Attachments,
 	Selection;
 
@@ -22,5 +21,5 @@
 
 			// The single `Attachment` view to be used in the `Attachments` view.
-			AttachmentView: AttachmentSelection
+			AttachmentView: wp.media.view.Attachment.Selection
 		});
 		// Call 'initialize' directly on the parent class.
Index: /trunk/src/wp-includes/js/media/views/audio-details.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/audio-details.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/audio-details.js	(revision 31935)
@@ -12,5 +12,5 @@
  * @augments Backbone.View
  */
-var MediaDetails = require( './media-details' ),
+var MediaDetails = wp.media.view.MediaDetails,
 	AudioDetails;
 
Index: /trunk/src/wp-includes/js/media/views/button-group.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/button-group.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/button-group.js	(revision 31935)
@@ -9,10 +9,8 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	Button = require( './button.js' ),
-	$ = Backbone.$,
+var $ = Backbone.$,
 	ButtonGroup;
 
-ButtonGroup = View.extend({
+ButtonGroup = wp.media.View.extend({
 	tagName:   'div',
 	className: 'button-group button-large media-button-group',
@@ -26,5 +24,5 @@
 				return button;
 			} else {
-				return new Button( button ).render();
+				return new wp.media.view.Button( button ).render();
 			}
 		});
Index: /trunk/src/wp-includes/js/media/views/button.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/button.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/button.js	(revision 31935)
@@ -9,8 +9,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	Button;
-
-Button = View.extend({
+var Button = wp.media.View.extend({
 	tagName:    'a',
 	className:  'media-button',
Index: /trunk/src/wp-includes/js/media/views/button/delete-selected-permanently.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/button/delete-selected-permanently.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/button/delete-selected-permanently.js	(revision 31935)
@@ -1,2 +1,4 @@
+/*globals wp */
+
 /**
  * wp.media.view.DeleteSelectedPermanentlyButton
@@ -12,5 +14,5 @@
  */
 var Button = wp.media.view.Button,
-	DeleteSelected = require( './delete-selected.js' ),
+	DeleteSelected = wp.media.view.DeleteSelectedButton,
 	DeleteSelectedPermanently;
 
Index: /trunk/src/wp-includes/js/media/views/cropper.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/cropper.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/cropper.js	(revision 31935)
@@ -15,7 +15,6 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	UploaderStatusError = require( './uploader/status-error.js' ),
-	UploaderStatus = require( './uploader/status.js' ),
+var View = wp.media.View,
+	UploaderStatus = wp.media.view.UploaderStatus,
 	l10n = wp.media.view.l10n,
 	$ = jQuery,
@@ -59,5 +58,5 @@
 		var filename = this.options.attachment.get('filename');
 
-		this.views.add( '.upload-errors', new UploaderStatusError({
+		this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
 			filename: UploaderStatus.prototype.filename(filename),
 			message: window._wpMediaViewsL10n.cropError
Index: /trunk/src/wp-includes/js/media/views/edit-image.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/edit-image.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/edit-image.js	(revision 31935)
@@ -9,5 +9,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
+var View = wp.media.View,
 	EditImage;
 
Index: /trunk/src/wp-includes/js/media/views/embed.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/embed.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/embed.js	(revision 31935)
@@ -7,11 +7,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	EmbedImage = require( './embed/image.js' ),
-	EmbedLink = require( './embed/link.js' ),
-	EmbedUrl = require( './embed/url.js' ),
-	Embed;
-
-Embed = View.extend({
+var Embed = wp.media.View.extend({
 	className: 'media-embed',
 
@@ -20,5 +14,5 @@
 		 * @member {wp.media.view.EmbedUrl}
 		 */
-		this.url = new EmbedUrl({
+		this.url = new wp.media.view.EmbedUrl({
 			controller: this.controller,
 			model:      this.model.props
@@ -47,7 +41,7 @@
 
 		if ( 'image' === type ) {
-			constructor = EmbedImage;
+			constructor = wp.media.view.EmbedImage;
 		} else if ( 'link' === type ) {
-			constructor = EmbedLink;
+			constructor = wp.media.view.EmbedLink;
 		} else {
 			return;
Index: /trunk/src/wp-includes/js/media/views/embed/image.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/embed/image.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/embed/image.js	(revision 31935)
@@ -11,5 +11,5 @@
  * @augments Backbone.View
  */
-var AttachmentDisplay = require( '../settings/attachment-display.js' ),
+var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
 	EmbedImage;
 
Index: /trunk/src/wp-includes/js/media/views/embed/link.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/embed/link.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/embed/link.js	(revision 31935)
@@ -10,9 +10,8 @@
  * @augments Backbone.View
  */
-var Settings = require( '../settings.js' ),
-	$ = jQuery,
+var $ = jQuery,
 	EmbedLink;
 
-EmbedLink = Settings.extend({
+EmbedLink = wp.media.view.Settings.extend({
 	className: 'embed-link-settings',
 	template:  wp.template('embed-link-settings'),
Index: /trunk/src/wp-includes/js/media/views/embed/url.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/embed/url.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/embed/url.js	(revision 31935)
@@ -9,5 +9,5 @@
  * @augments Backbone.View
  */
-var View = require( '../view.js' ),
+var View = wp.media.View,
 	$ = jQuery,
 	EmbedUrl;
Index: /trunk/src/wp-includes/js/media/views/focus-manager.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/focus-manager.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/focus-manager.js	(revision 31935)
@@ -7,8 +7,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	FocusManager;
-
-FocusManager = View.extend({
+var FocusManager = wp.media.View.extend({
 
 	events: {
Index: /trunk/src/wp-includes/js/media/views/frame.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/frame.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/frame.js	(revision 31935)
@@ -16,11 +16,5 @@
  * @mixes wp.media.controller.StateMachine
  */
-var StateMachine = require( '../controllers/state-machine.js' ),
-	State = require( '../controllers/state.js' ),
-	Region = require( '../controllers/region.js' ),
-	View = require( './view.js' ),
-	Frame;
-
-Frame = View.extend({
+var Frame = wp.media.View.extend({
 	initialize: function() {
 		_.defaults( this.options, {
@@ -38,5 +32,5 @@
 		// Initialize regions.
 		_.each( this.regions, function( region ) {
-			this[ region ] = new Region({
+			this[ region ] = new wp.media.controller.Region({
 				view:     this,
 				id:       region,
@@ -56,5 +50,5 @@
 		// Create the default `states` collection.
 		this.states = new Backbone.Collection( null, {
-			model: State
+			model: wp.media.controller.State
 		});
 
@@ -168,5 +162,5 @@
 
 // Make the `Frame` a `StateMachine`.
-_.extend( Frame.prototype, StateMachine.prototype );
+_.extend( Frame.prototype, wp.media.controller.StateMachine.prototype );
 
 module.exports = Frame;
Index: /trunk/src/wp-includes/js/media/views/frame/audio-details.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/frame/audio-details.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/frame/audio-details.js	(revision 31935)
@@ -16,7 +16,5 @@
 var MediaDetails = wp.media.view.MediaFrame.MediaDetails,
 	MediaLibrary = wp.media.controller.MediaLibrary,
-	
-	AudioDetailsView = require( '../audio-details.js' ),
-	AudioDetailsController = require( '../../controllers/audio-details.js' ),
+
 	l10n = wp.media.view.l10n,
 	AudioDetails;
@@ -35,5 +33,5 @@
 
 	initialize: function( options ) {
-		options.DetailsView = AudioDetailsView;
+		options.DetailsView = wp.media.view.AudioDetails;
 		options.cancelText = l10n.audioDetailsCancel;
 		options.addText = l10n.audioAddSourceTitle;
@@ -51,5 +49,5 @@
 	createStates: function() {
 		this.states.add([
-			new AudioDetailsController( {
+			new wp.media.controller.AudioDetails( {
 				media: this.media
 			} ),
Index: /trunk/src/wp-includes/js/media/views/frame/edit-attachments.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/frame/edit-attachments.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/frame/edit-attachments.js	(revision 31935)
@@ -19,11 +19,4 @@
 var Frame = wp.media.view.Frame,
 	MediaFrame = wp.media.view.MediaFrame,
-	Modal = wp.media.view.Modal,
-	AttachmentCompat = wp.media.view.AttachmentCompat,
-	EditImageController = wp.media.controller.EditImage,
-
-	EditAttachmentMetadata = require( '../../controllers/edit-attachment-metadata.js' ),
-	TwoColumn = require( '../attachment/details-two-column.js' ),
-	DetailsView = require( '../edit-image-details.js' ),
 
 	$ = jQuery,
@@ -81,5 +74,5 @@
 		// Initialize modal container view.
 		if ( this.options.modal ) {
-			this.modal = new Modal({
+			this.modal = new wp.media.view.Modal({
 				controller: this,
 				title:      this.options.title
@@ -110,5 +103,5 @@
 	createStates: function() {
 		this.states.add([
-			new EditAttachmentMetadata( { model: this.model } )
+			new wp.media.controller.EditAttachmentMetadata( { model: this.model } )
 		]);
 	},
@@ -121,5 +114,5 @@
 	 */
 	editMetadataMode: function( contentRegion ) {
-		contentRegion.view = new TwoColumn({
+		contentRegion.view = new wp.media.view.Attachment.Details.TwoColumn({
 			controller: this,
 			model:      this.model
@@ -130,5 +123,5 @@
 		 * `attachment_fields_to_edit` filter.
 		 */
-		contentRegion.view.views.set( '.attachment-compat', new AttachmentCompat({
+		contentRegion.view.views.set( '.attachment-compat', new wp.media.view.AttachmentCompat({
 			controller: this,
 			model:      this.model
@@ -148,5 +141,5 @@
 	 */
 	editImageMode: function( contentRegion ) {
-		var editImageController = new EditImageController( {
+		var editImageController = new wp.media.controller.EditImage( {
 			model: this.model,
 			frame: this
@@ -157,5 +150,5 @@
 		editImageController._menu = function() {};
 
-		contentRegion.view = new DetailsView( {
+		contentRegion.view = new wp.media.view.EditImage.Details( {
 			model: this.model,
 			frame: this,
Index: /trunk/src/wp-includes/js/media/views/frame/image-details.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/frame/image-details.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/frame/image-details.js	(revision 31935)
@@ -16,11 +16,5 @@
  * @mixes wp.media.controller.StateMachine
  */
-var Select = require( './select.js' ),
-	Toolbar = require( '../toolbar.js' ),
-	ImageDetailsController = require( '../../controllers/image-details.js' ),
-	ReplaceImageController = require( '../../controllers/replace-image.js' ),
-	EditImageController = require( '../../controllers/edit-image.js' ),
-	ImageDetailsView = require( '../image-details.js' ),
-	EditImageView = require( '../edit-image.js' ),
+var Select = wp.media.view.MediaFrame.Select,
 	l10n = wp.media.view.l10n,
 	ImageDetails;
@@ -56,9 +50,9 @@
 	createStates: function() {
 		this.states.add([
-			new ImageDetailsController({
+			new wp.media.controller.ImageDetails({
 				image: this.image,
 				editable: false
 			}),
-			new ReplaceImageController({
+			new wp.media.controller.ReplaceImage({
 				id: 'replace-image',
 				library: wp.media.query( { type: 'image' } ),
@@ -70,5 +64,5 @@
 				displaySettings: true
 			}),
-			new EditImageController( {
+			new wp.media.controller.EditImage( {
 				image: this.image,
 				selection: this.options.selection
@@ -78,5 +72,5 @@
 
 	imageDetailsContent: function( options ) {
-		options.view = new ImageDetailsView({
+		options.view = new wp.media.view.ImageDetails({
 			controller: this,
 			model: this.state().image,
@@ -94,5 +88,5 @@
 		}
 
-		view = new EditImageView( { model: model, controller: this } ).render();
+		view = new wp.media.view.EditImage( { model: model, controller: this } ).render();
 
 		this.content.set( view );
@@ -104,5 +98,5 @@
 
 	renderImageDetailsToolbar: function() {
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
@@ -136,5 +130,5 @@
 			previous = lastState && lastState.id;
 
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
Index: /trunk/src/wp-includes/js/media/views/frame/manage.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/frame/manage.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/frame/manage.js	(revision 31935)
@@ -17,9 +17,5 @@
  */
 var MediaFrame = wp.media.view.MediaFrame,
-	UploaderWindow = wp.media.view.UploaderWindow,
-	AttachmentsBrowser = wp.media.view.AttachmentsBrowser,
 	Library = wp.media.controller.Library,
-
-	Router = require( '../../routers/manage.js' ),
 
 	$ = Backbone.$,
@@ -59,5 +55,5 @@
 		// Initialize a window-wide uploader.
 		if ( this.options.uploader ) {
-			this.uploader = new UploaderWindow({
+			this.uploader = new wp.media.view.UploaderWindow({
 				controller: this,
 				uploader: {
@@ -72,5 +68,5 @@
 		}
 
-		this.gridRouter = new Router();
+		this.gridRouter = new wp.media.view.MediaFrame.Manage.Router();
 
 		// Call 'initialize' directly on the parent class.
@@ -222,5 +218,5 @@
 
 		// Browse our library of attachments.
-		this.browserView = contentRegion.view = new AttachmentsBrowser({
+		this.browserView = contentRegion.view = new wp.media.view.AttachmentsBrowser({
 			controller: this,
 			collection: state.get('library'),
Index: /trunk/src/wp-includes/js/media/views/frame/media-details.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/frame/media-details.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/frame/media-details.js	(revision 31935)
@@ -13,7 +13,5 @@
  * @mixes wp.media.controller.StateMachine
  */
-var View = wp.media.View,
-	Toolbar = wp.media.view.Toolbar,
-	Select = wp.media.view.MediaFrame.Select,
+var Select = wp.media.view.MediaFrame.Select,
 	l10n = wp.media.view.l10n,
 	MediaDetails;
@@ -78,5 +76,5 @@
 				}
 			},
-			separateCancel: new View({
+			separateCancel: new wp.media.View({
 				className: 'separator',
 				priority: 40
@@ -87,5 +85,5 @@
 
 	setPrimaryButton: function(text, handler) {
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
Index: /trunk/src/wp-includes/js/media/views/frame/post.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/frame/post.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/frame/post.js	(revision 31935)
@@ -15,22 +15,6 @@
  * @mixes wp.media.controller.StateMachine
  */
-var View = require( '../view.js' ),
-	Select = require( './select.js' ),
-	Library = require( '../../controllers/library.js' ),
-	Embed = require( '../embed.js' ),
-	EditImage = require( '../edit-image.js' ),
-	EditSelection = require( '../attachment/edit-selection.js' ),
-	Toolbar = require( '../toolbar.js' ),
-	ToolbarEmbed = require( '../toolbar/embed.js' ),
-	PlaylistSettings = require( '../settings/playlist.js' ),
-	AttachmentsBrowser = require( '../attachments/browser.js' ),
-	SelectionView = require( '../selection.js' ),
-	EmbedController = require( '../../controllers/embed.js' ),
-	EditImageController = require( '../../controllers/edit-image.js' ),
-	GalleryEditController = require( '../../controllers/gallery-edit.js' ),
-	GalleryAddController = require( '../../controllers/gallery-add.js' ),
-	CollectionEditController = require( '../../controllers/collection-edit.js' ),
-	CollectionAddController = require( '../../controllers/collection-add.js' ),
-	FeaturedImageController = require( '../../controllers/featured-image.js' ),
+var Select = wp.media.view.MediaFrame.Select,
+	Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	Post;
@@ -106,10 +90,10 @@
 
 			// Embed states.
-			new EmbedController( { metadata: options.metadata } ),
-
-			new EditImageController( { model: options.editImage } ),
+			new wp.media.controller.Embed( { metadata: options.metadata } ),
+
+			new wp.media.controller.EditImage( { model: options.editImage } ),
 
 			// Gallery states.
-			new GalleryEditController({
+			new wp.media.controller.GalleryEdit({
 				library: options.selection,
 				editing: options.editing,
@@ -117,5 +101,5 @@
 			}),
 
-			new GalleryAddController(),
+			new wp.media.controller.GalleryAdd(),
 
 			new Library({
@@ -134,9 +118,9 @@
 
 			// Playlist states.
-			new CollectionEditController({
+			new wp.media.controller.CollectionEdit({
 				type: 'audio',
 				collectionType: 'playlist',
 				title:          l10n.editPlaylistTitle,
-				SettingsView:   PlaylistSettings,
+				SettingsView:   wp.media.view.Settings.Playlist,
 				library:        options.selection,
 				editing:        options.editing,
@@ -146,5 +130,5 @@
 			}),
 
-			new CollectionAddController({
+			new wp.media.controller.CollectionAdd({
 				type: 'audio',
 				collectionType: 'playlist',
@@ -166,9 +150,9 @@
 			}),
 
-			new CollectionEditController({
+			new wp.media.controller.CollectionEdit({
 				type: 'video',
 				collectionType: 'playlist',
 				title:          l10n.editVideoPlaylistTitle,
-				SettingsView:   PlaylistSettings,
+				SettingsView:   wp.media.view.Settings.Playlist,
 				library:        options.selection,
 				editing:        options.editing,
@@ -178,5 +162,5 @@
 			}),
 
-			new CollectionAddController({
+			new wp.media.controller.CollectionAdd({
 				type: 'video',
 				collectionType: 'playlist',
@@ -186,5 +170,5 @@
 
 		if ( wp.media.view.settings.post.featuredImageId ) {
-			this.states.add( new FeaturedImageController() );
+			this.states.add( new wp.media.controller.FeaturedImage() );
 		}
 	},
@@ -273,5 +257,5 @@
 	mainMenu: function( view ) {
 		view.set({
-			'library-separator': new View({
+			'library-separator': new wp.media.View({
 				className: 'separator',
 				priority: 100
@@ -312,5 +296,5 @@
 				}
 			},
-			separateCancel: new View({
+			separateCancel: new wp.media.View({
 				className: 'separator',
 				priority: 40
@@ -336,5 +320,5 @@
 				}
 			},
-			separateCancel: new View({
+			separateCancel: new wp.media.View({
 				className: 'separator',
 				priority: 40
@@ -360,5 +344,5 @@
 				}
 			},
-			separateCancel: new View({
+			separateCancel: new wp.media.View({
 				className: 'separator',
 				priority: 40
@@ -369,5 +353,5 @@
 	// Content
 	embedContent: function() {
-		var view = new Embed({
+		var view = new wp.media.view.Embed({
 			controller: this,
 			model:      this.state()
@@ -386,5 +370,5 @@
 			view;
 
-		view = new AttachmentsBrowser({
+		view = new wp.media.view.AttachmentsBrowser({
 			controller: this,
 			collection: selection,
@@ -396,5 +380,5 @@
 			dragInfo:   true,
 
-			AttachmentView: EditSelection
+			AttachmentView: wp.media.view.Attachments.EditSelection
 		}).render();
 
@@ -417,5 +401,5 @@
 	editImageContent: function() {
 		var image = this.state().get('image'),
-			view = new EditImage( { model: image, controller: this } ).render();
+			view = new wp.media.view.EditImage( { model: image, controller: this } ).render();
 
 		this.content.set( view );
@@ -434,5 +418,5 @@
 		var editable = this.state().get('editable');
 
-		view.set( 'selection', new SelectionView({
+		view.set( 'selection', new wp.media.view.Selection({
 			controller: this,
 			collection: this.state().get('selection'),
@@ -575,5 +559,5 @@
 
 	mainEmbedToolbar: function( toolbar ) {
-		toolbar.view = new ToolbarEmbed({
+		toolbar.view = new wp.media.view.Toolbar.Embed({
 			controller: this
 		});
@@ -582,5 +566,5 @@
 	galleryEditToolbar: function() {
 		var editing = this.state().get('editing');
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
@@ -611,5 +595,5 @@
 
 	galleryAddToolbar: function() {
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
@@ -639,5 +623,5 @@
 	playlistEditToolbar: function() {
 		var editing = this.state().get('editing');
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
@@ -668,5 +652,5 @@
 
 	playlistAddToolbar: function() {
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
@@ -696,5 +680,5 @@
 	videoPlaylistEditToolbar: function() {
 		var editing = this.state().get('editing');
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
@@ -725,5 +709,5 @@
 
 	videoPlaylistAddToolbar: function() {
-		this.toolbar.set( new Toolbar({
+		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
 			items: {
Index: /trunk/src/wp-includes/js/media/views/frame/select.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/frame/select.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/frame/select.js	(revision 31935)
@@ -15,9 +15,5 @@
  */
 
-var MediaFrame = require( '../media-frame.js' ),
-	Library = require( '../../controllers/library.js' ),
-	AttachmentsBrowser = require( '../attachments/browser.js' ),
-	UploaderInline = require( '../uploader/inline.js' ),
-	ToolbarSelect = require( '../toolbar/select.js' ),
+var MediaFrame = wp.media.view.MediaFrame,
 	l10n = wp.media.view.l10n,
 	Select;
@@ -77,5 +73,5 @@
 		this.states.add([
 			// Main states.
-			new Library({
+			new wp.media.controller.Library({
 				library:   wp.media.query( options.library ),
 				multiple:  options.multiple,
@@ -128,5 +124,5 @@
 
 		// Browse our library of attachments.
-		contentRegion.view = new AttachmentsBrowser({
+		contentRegion.view = new wp.media.view.AttachmentsBrowser({
 			controller: this,
 			collection: state.get('library'),
@@ -152,5 +148,5 @@
 	uploadContent: function() {
 		this.$el.removeClass( 'hide-toolbar' );
-		this.content.set( new UploaderInline({
+		this.content.set( new wp.media.view.UploaderInline({
 			controller: this
 		}) );
@@ -168,5 +164,5 @@
 		options.controller = this;
 
-		toolbar.view = new ToolbarSelect( options );
+		toolbar.view = new wp.media.view.Toolbar.Select( options );
 	}
 });
Index: /trunk/src/wp-includes/js/media/views/frame/video-details.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/frame/video-details.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/frame/video-details.js	(revision 31935)
@@ -16,6 +16,4 @@
 var MediaDetails = wp.media.view.MediaFrame.MediaDetails,
 	MediaLibrary = wp.media.controller.MediaLibrary,
-	VideoDetailsView = require( '../video-details.js' ),
-	VideoDetailsController = require( '../../controllers/video-details.js' ),
 	l10n = wp.media.view.l10n,
 	VideoDetails;
@@ -34,5 +32,5 @@
 
 	initialize: function( options ) {
-		options.DetailsView = VideoDetailsView;
+		options.DetailsView = wp.media.view.VideoDetails;
 		options.cancelText = l10n.videoDetailsCancel;
 		options.addText = l10n.videoAddSourceTitle;
@@ -52,5 +50,5 @@
 	createStates: function() {
 		this.states.add([
-			new VideoDetailsController({
+			new wp.media.controller.VideoDetails({
 				media: this.media
 			}),
Index: /trunk/src/wp-includes/js/media/views/iframe.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/iframe.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/iframe.js	(revision 31935)
@@ -7,8 +7,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	Iframe;
-
-Iframe = View.extend({
+var Iframe = wp.media.View.extend({
 	className: 'media-iframe',
 	/**
Index: /trunk/src/wp-includes/js/media/views/image-details.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/image-details.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/image-details.js	(revision 31935)
@@ -11,5 +11,5 @@
  * @augments Backbone.View
  */
-var AttachmentDisplay = require( './settings/attachment-display.js' ),
+var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
 	$ = jQuery,
 	ImageDetails;
Index: /trunk/src/wp-includes/js/media/views/label.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/label.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/label.js	(revision 31935)
@@ -7,8 +7,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	Label;
-
-Label = View.extend({
+var Label = wp.media.View.extend({
 	tagName: 'label',
 	className: 'screen-reader-text',
Index: /trunk/src/wp-includes/js/media/views/media-frame.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/media-frame.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/media-frame.js	(revision 31935)
@@ -13,12 +13,5 @@
  * @mixes wp.media.controller.StateMachine
  */
-var View = require( './view.js' ),
-	Frame = require( './frame.js' ),
-	Modal = require( './modal.js' ),
-	UploaderWindow = require( './uploader/window.js' ),
-	Menu = require( './menu.js' ),
-	Toolbar = require( './toolbar.js' ),
-	Router = require( './router.js' ),
-	Iframe = require( './iframe.js' ),
+var Frame = wp.media.view.Frame,
 	$ = jQuery,
 	MediaFrame;
@@ -50,5 +43,5 @@
 		// Initialize modal container view.
 		if ( this.options.modal ) {
-			this.modal = new Modal({
+			this.modal = new wp.media.view.Modal({
 				controller: this,
 				title:      this.options.title
@@ -66,5 +59,5 @@
 		// Initialize window-wide uploader.
 		if ( this.options.uploader ) {
-			this.uploader = new UploaderWindow({
+			this.uploader = new wp.media.view.UploaderWindow({
 				controller: this,
 				uploader: {
@@ -107,5 +100,5 @@
 	 */
 	createTitle: function( title ) {
-		title.view = new View({
+		title.view = new wp.media.View({
 			controller: this,
 			tagName: 'h1'
@@ -117,5 +110,5 @@
 	 */
 	createMenu: function( menu ) {
-		menu.view = new Menu({
+		menu.view = new wp.media.view.Menu({
 			controller: this
 		});
@@ -131,5 +124,5 @@
 	 */
 	createToolbar: function( toolbar ) {
-		toolbar.view = new Toolbar({
+		toolbar.view = new wp.media.view.Toolbar({
 			controller: this
 		});
@@ -140,5 +133,5 @@
 	 */
 	createRouter: function( router ) {
-		router.view = new Router({
+		router.view = new wp.media.view.Router({
 			controller: this
 		});
@@ -187,5 +180,5 @@
 	iframeContent: function( content ) {
 		this.$el.addClass('hide-toolbar');
-		content.view = new Iframe({
+		content.view = new wp.media.view.Iframe({
 			controller: this
 		});
Index: /trunk/src/wp-includes/js/media/views/menu-item.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/menu-item.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/menu-item.js	(revision 31935)
@@ -9,9 +9,8 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	$ = jQuery,
+var $ = jQuery,
 	MenuItem;
 
-MenuItem = View.extend({
+MenuItem = wp.media.View.extend({
 	tagName:   'a',
 	className: 'media-menu-item',
Index: /trunk/src/wp-includes/js/media/views/menu.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/menu.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/menu.js	(revision 31935)
@@ -8,6 +8,6 @@
  * @augments Backbone.View
  */
-var MenuItem = require( './menu-item.js' ),
-	PriorityList = require( './priority-list.js' ),
+var MenuItem = wp.media.view.MenuItem,
+	PriorityList = wp.media.view.PriorityList,
 	Menu;
 
Index: /trunk/src/wp-includes/js/media/views/modal.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/modal.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/modal.js	(revision 31935)
@@ -11,10 +11,8 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	FocusManager = require( './focus-manager.js' ),
-	$ = jQuery,
+var $ = jQuery,
 	Modal;
 
-Modal = View.extend({
+Modal = wp.media.View.extend({
 	tagName:  'div',
 	template: wp.template('media-modal'),
@@ -37,5 +35,5 @@
 		});
 
-		this.focusManager = new FocusManager({
+		this.focusManager = new wp.media.view.FocusManager({
 			el: this.el
 		});
Index: /trunk/src/wp-includes/js/media/views/priority-list.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/priority-list.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/priority-list.js	(revision 31935)
@@ -9,8 +9,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	PriorityList;
-
-PriorityList = View.extend({
+var PriorityList = wp.media.View.extend({
 	tagName:   'div',
 
@@ -94,5 +91,5 @@
 	 */
 	toView: function( options ) {
-		return new View( options );
+		return new wp.media.View( options );
 	}
 });
Index: /trunk/src/wp-includes/js/media/views/router-item.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/router-item.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/router-item.js	(revision 31935)
@@ -8,8 +8,5 @@
  * @augments Backbone.View
  */
-var MenuItem = require( './menu-item.js' ),
-	RouterItem;
-
-RouterItem = MenuItem.extend({
+var RouterItem = wp.media.view.MenuItem.extend({
 	/**
 	 * On click handler to activate the content region's corresponding mode.
Index: /trunk/src/wp-includes/js/media/views/router.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/router.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/router.js	(revision 31935)
@@ -1,2 +1,4 @@
+/*globals wp */
+
 /**
  * wp.media.view.Router
@@ -9,6 +11,5 @@
  * @augments Backbone.View
  */
-var Menu = require( './menu.js' ),
-	RouterItem = require( './router-item.js' ),
+var Menu = wp.media.view.Menu,
 	Router;
 
@@ -17,5 +18,5 @@
 	className: 'media-router',
 	property:  'contentMode',
-	ItemView:  RouterItem,
+	ItemView:  wp.media.view.RouterItem,
 	region:    'router',
 
Index: /trunk/src/wp-includes/js/media/views/search.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/search.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/search.js	(revision 31935)
@@ -9,9 +9,8 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	Search;
 
-Search = View.extend({
+Search = wp.media.View.extend({
 	tagName:   'input',
 	className: 'search',
Index: /trunk/src/wp-includes/js/media/views/selection.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/selection.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/selection.js	(revision 31935)
@@ -9,10 +9,8 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	AttachmentsSelection = require( './attachments/selection.js' ),
-	l10n = wp.media.view.l10n,
+var l10n = wp.media.view.l10n,
 	Selection;
 
-Selection = View.extend({
+Selection = wp.media.View.extend({
 	tagName:   'div',
 	className: 'media-selection',
@@ -33,5 +31,5 @@
 		 * @member {wp.media.view.Attachments.Selection}
 		 */
-		this.attachments = new AttachmentsSelection({
+		this.attachments = new wp.media.view.Attachments.Selection({
 			controller: this.controller,
 			collection: this.collection,
Index: /trunk/src/wp-includes/js/media/views/settings.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/settings.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/settings.js	(revision 31935)
@@ -9,5 +9,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
+var View = wp.media.View,
 	$ = Backbone.$,
 	Settings;
Index: /trunk/src/wp-includes/js/media/views/settings/attachment-display.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/settings/attachment-display.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/settings/attachment-display.js	(revision 31935)
@@ -10,5 +10,5 @@
  * @augments Backbone.View
  */
-var Settings = require( '../settings.js' ),
+var Settings = wp.media.view.Settings,
 	AttachmentDisplay;
 
Index: /trunk/src/wp-includes/js/media/views/settings/gallery.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/settings/gallery.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/settings/gallery.js	(revision 31935)
@@ -10,8 +10,5 @@
  * @augments Backbone.View
  */
-var Settings = require( '../settings.js' ),
-	Gallery;
-
-Gallery = Settings.extend({
+var Gallery = wp.media.view.Settings.extend({
 	className: 'collection-settings gallery-settings',
 	template:  wp.template('gallery-settings')
Index: /trunk/src/wp-includes/js/media/views/settings/playlist.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/settings/playlist.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/settings/playlist.js	(revision 31935)
@@ -10,8 +10,5 @@
  * @augments Backbone.View
  */
-var Settings = require( '../settings.js' ),
-	Playlist;
-
-Playlist = Settings.extend({
+var Playlist = wp.media.view.Settings.extend({
 	className: 'collection-settings playlist-settings',
 	template:  wp.template('playlist-settings')
Index: /trunk/src/wp-includes/js/media/views/sidebar.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/sidebar.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/sidebar.js	(revision 31935)
@@ -8,8 +8,5 @@
  * @augments Backbone.View
  */
-var PriorityList = require( './priority-list.js' ),
-	Sidebar;
-
-Sidebar = PriorityList.extend({
+var Sidebar = wp.media.view.PriorityList.extend({
 	className: 'media-sidebar'
 });
Index: /trunk/src/wp-includes/js/media/views/spinner.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/spinner.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/spinner.js	(revision 31935)
@@ -9,8 +9,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	Spinner;
-
-Spinner = View.extend({
+var Spinner = wp.media.View.extend({
 	tagName:   'span',
 	className: 'spinner',
Index: /trunk/src/wp-includes/js/media/views/toolbar.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/toolbar.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/toolbar.js	(revision 31935)
@@ -12,7 +12,5 @@
  * @augments Backbone.View
  */
-var View = require( './view.js' ),
-	Button = require( './button.js' ),
-	PriorityList = require( './priority-list.js' ),
+var View = wp.media.View,
 	Toolbar;
 
@@ -29,6 +27,6 @@
 
 		// The toolbar is composed of two `PriorityList` views.
-		this.primary   = new PriorityList();
-		this.secondary = new PriorityList();
+		this.primary   = new wp.media.view.PriorityList();
+		this.secondary = new wp.media.view.PriorityList();
 		this.primary.$el.addClass('media-toolbar-primary search-form');
 		this.secondary.$el.addClass('media-toolbar-secondary');
@@ -92,5 +90,5 @@
 			if ( ! ( view instanceof Backbone.View ) ) {
 				view.classes = [ 'media-button-' + id ].concat( view.classes || [] );
-				view = new Button( view ).render();
+				view = new wp.media.view.Button( view ).render();
 			}
 
Index: /trunk/src/wp-includes/js/media/views/toolbar/embed.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/toolbar/embed.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/toolbar/embed.js	(revision 31935)
@@ -11,5 +11,5 @@
  * @augments Backbone.View
  */
-var Select = require( './select.js' ),
+var Select = wp.media.view.Toolbar.Select,
 	l10n = wp.media.view.l10n,
 	Embed;
Index: /trunk/src/wp-includes/js/media/views/toolbar/select.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/toolbar/select.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/toolbar/select.js	(revision 31935)
@@ -10,5 +10,5 @@
  * @augments Backbone.View
  */
-var Toolbar = require( '../toolbar.js' ),
+var Toolbar = wp.media.view.Toolbar,
 	l10n = wp.media.view.l10n,
 	Select;
Index: /trunk/src/wp-includes/js/media/views/uploader/editor.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/uploader/editor.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/uploader/editor.js	(revision 31935)
@@ -12,5 +12,5 @@
  * @augments Backbone.View
  */
-var View = require( '../view.js' ),
+var View = wp.media.View,
 	l10n = wp.media.view.l10n,
 	$ = jQuery,
Index: /trunk/src/wp-includes/js/media/views/uploader/inline.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/uploader/inline.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/uploader/inline.js	(revision 31935)
@@ -11,6 +11,5 @@
  * @augments Backbone.View
  */
-var View = require( '../view.js' ),
-	UploaderStatus = require( './status.js' ),
+var View = wp.media.View,
 	UploaderInline;
 
@@ -40,5 +39,5 @@
 
 		if ( this.options.status ) {
-			this.views.set( '.upload-inline-status', new UploaderStatus({
+			this.views.set( '.upload-inline-status', new wp.media.view.UploaderStatus({
 				controller: this.controller
 			}) );
Index: /trunk/src/wp-includes/js/media/views/uploader/status-error.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/uploader/status-error.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/uploader/status-error.js	(revision 31935)
@@ -9,8 +9,5 @@
  * @augments Backbone.View
  */
-var View = require( '../view.js' ),
-	UploaderStatusError;
-
-UploaderStatusError = View.extend({
+var UploaderStatusError = wp.media.View.extend({
 	className: 'upload-error',
 	template:  wp.template('uploader-status-error')
Index: /trunk/src/wp-includes/js/media/views/uploader/status.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/uploader/status.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/uploader/status.js	(revision 31935)
@@ -11,6 +11,5 @@
  * @augments Backbone.View
  */
-var View = require( '../view.js' ),
-	UploaderStatusError = require( './status-error.js' ),
+var View = wp.media.View,
 	UploaderStatus;
 
@@ -114,5 +113,5 @@
 	 */
 	error: function( error ) {
-		this.views.add( '.upload-errors', new UploaderStatusError({
+		this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
 			filename: this.filename( error.get('file').name ),
 			message:  error.get('message')
Index: /trunk/src/wp-includes/js/media/views/uploader/window.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/uploader/window.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/uploader/window.js	(revision 31935)
@@ -17,9 +17,8 @@
  * @param {object} [options.uploader.params]
  */
-var View = require( '../view.js' ),
-	$ = jQuery,
+var $ = jQuery,
 	UploaderWindow;
 
-UploaderWindow = View.extend({
+UploaderWindow = wp.media.View.extend({
 	tagName:   'div',
 	className: 'uploader-window',
Index: /trunk/src/wp-includes/js/media/views/video-details.js
===================================================================
--- /trunk/src/wp-includes/js/media/views/video-details.js	(revision 31934)
+++ /trunk/src/wp-includes/js/media/views/video-details.js	(revision 31935)
@@ -12,5 +12,5 @@
  * @augments Backbone.View
  */
-var MediaDetails = require( './media-details' ),
+var MediaDetails = wp.media.view.MediaDetails,
 	VideoDetails;
 
