diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index b3106e9e3..ca7bfbfae 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -185,7 +185,9 @@
   <ItemGroup>
     <Compile Include="App_Start\DataTablesMvc.cs" />
     <Compile Include="App_Start\MiniProfiler.cs" />
-    <Content Include="_backboneApp\AddSeries\addNewSeriesTemplate.html" />
+    <Content Include="_backboneApp\AddSeries\AddNewSeries\AddNewSeriesTemplate.html" />
+    <Content Include="_backboneApp\AddSeries\AddNewSeries\AddNewSeriesView.js" />
+    <Content Include="_backboneApp\AddSeries\SeriesSearchModel.js" />
     <Content Include="_backboneApp\Content\Intelisense\bootstrap.css" />
     <Content Include="_backboneApp\JsLibraries\backbone.marionette.extend.js" />
     <Compile Include="_backboneApp\CassetteConfiguration.cs" />
@@ -196,7 +198,7 @@
     <Compile Include="Helpers\RenderActionHelper.cs" />
     <Compile Include="Helpers\Validation\RequiredIfAnyAttribute.cs" />
     <Compile Include="Helpers\Validation\RequiredIfAttribute.cs" />
-    <Content Include="_backboneApp\AddSeries\addSeriesView.js" />
+    <Content Include="_backboneApp\AddSeries\AddSeriesLayout.js" />
     <Content Include="_backboneApp\AddSeries\addSeries.css" />
     <Content Include="_backboneApp\app.js" />
     <Content Include="_backboneApp\Content\base.css" />
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/addNewSeriesTemplate.html b/NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/AddNewSeriesTemplate.html
similarity index 100%
rename from NzbDrone.Web/_backboneApp/AddSeries/addNewSeriesTemplate.html
rename to NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/AddNewSeriesTemplate.html
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/AddNewSeriesView.js b/NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/AddNewSeriesView.js
new file mode 100644
index 000000000..efc9477f3
--- /dev/null
+++ b/NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/AddNewSeriesView.js
@@ -0,0 +1,27 @@
+/// <reference path="../../app.js" />
+/// <reference path="../SeriesSearchModel.js" />
+
+NzbDrone.AddSeries.AddNewSeriesView = Backbone.Marionette.ItemView.extend({
+    template: "AddSeries/AddNewSeries/AddNewSeriesTemplate",
+
+    ui: {
+        seriesSearch: '.search input'
+    },
+
+    onRender: function() {
+
+        console.log('binding auto complete');
+        var self = this;
+
+        this.ui.seriesSearch
+            .data('timeout', null)
+            .keyup(function() {
+                clearTimeout(self.$el.data('timeout'));
+                self.$el.data('timeout', setTimeout(self.search, 500, self));
+            });
+    },
+
+    search: function(context) {
+        console.log(context.ui.seriesSearch.val());
+    },
+});
\ No newline at end of file
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/AddSeriesLayout.js b/NzbDrone.Web/_backboneApp/AddSeries/AddSeriesLayout.js
new file mode 100644
index 000000000..127a1b942
--- /dev/null
+++ b/NzbDrone.Web/_backboneApp/AddSeries/AddSeriesLayout.js
@@ -0,0 +1,24 @@
+/// <reference path="../app.js" />
+/// <reference path="AddNewSeries/AddNewSeriesView.js" />
+
+NzbDrone.AddSeries.AddSeriesLayout = Backbone.Marionette.Layout.extend({
+    template: "AddSeries/addSeriesLayoutTemplate",
+
+    regions: {
+        addNew: "#add-new",
+        importExisting: "#import-existing",
+        rootFolders: "#root-folders"
+    },
+
+    onRender: function () {
+        this.$('#myTab a').click(function (e) {
+            e.preventDefault();
+            $(this).tab('show');
+        });
+
+        this.addNew.show(new NzbDrone.AddSeries.AddNewSeriesView());
+        //this.importExisting.show(new NzbDrone.ImportExistingView());
+        //this.rootFolders.show(new NzbDrone.RootFoldersView());
+    },
+
+});
\ No newline at end of file
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/SeriesSearchModel.js b/NzbDrone.Web/_backboneApp/AddSeries/SeriesSearchModel.js
new file mode 100644
index 000000000..42c95ccc3
--- /dev/null
+++ b/NzbDrone.Web/_backboneApp/AddSeries/SeriesSearchModel.js
@@ -0,0 +1,10 @@
+/// <reference path="../app.js" />
+
+NzbDrone.AddSeries.SeriesSearchResultModel = Backbone.Model.extend({
+
+});
+
+NzbDrone.AddSeries.SeriesSearchResultCollection = Backbone.Collection.extend({
+
+});
+
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/addSeriesView.js b/NzbDrone.Web/_backboneApp/AddSeries/addSeriesView.js
deleted file mode 100644
index 1d194baa2..000000000
--- a/NzbDrone.Web/_backboneApp/AddSeries/addSeriesView.js
+++ /dev/null
@@ -1,56 +0,0 @@
-NzbDrone.AddNewSeriesView = Backbone.Marionette.ItemView.extend({
-    template: "AddSeries/addNewSeriesTemplate",
-
-    ui: {
-        seriesSearch: '.search input'
-    },
-
-    onRender: function () {
-
-        console.log('binding auto complete');
-        var self = this;
-
-        this.ui.seriesSearch
-            .data('timeout', null)
-            .keyup(function () {
-                clearTimeout(self.$el.data('timeout'));
-                self.$el.data('timeout', setTimeout(self.search, 500, self));
-            });
-    },
-
-    search: function (context) {
-        console.log(context.ui.seriesSearch.val());
-    },
-});
-
-NzbDrone.ImportExistingView = Backbone.Marionette.ItemView.extend({
-    template: "AddSeries/ImportExistingTemplate",
-
-});
-
-NzbDrone.RootFoldersView = Backbone.Marionette.ItemView.extend({
-    template: "AddSeries/RootFoldersTemplate",
-
-});
-
-NzbDrone.AddSeriesLayout = Backbone.Marionette.Layout.extend({
-    template: "AddSeries/addSeriesLayoutTemplate",
-
-    regions: {
-        addNew: "#add-new",
-        importExisting: "#import-existing",
-        rootFolders: "#root-folders"
-    },
-
-    onRender: function () {
-        this.$('#myTab a').click(function (e) {
-            e.preventDefault();
-            $(this).tab('show');
-        });
-
-        this.addNew.show(new NzbDrone.AddNewSeriesView());
-        this.importExisting.show(new NzbDrone.ImportExistingView());
-        this.rootFolders.show(new NzbDrone.RootFoldersView());
-    },
-
-});
\ No newline at end of file
diff --git a/NzbDrone.Web/_backboneApp/CassetteConfiguration.cs b/NzbDrone.Web/_backboneApp/CassetteConfiguration.cs
index b51a9da7d..0af5cb438 100644
--- a/NzbDrone.Web/_backboneApp/CassetteConfiguration.cs
+++ b/NzbDrone.Web/_backboneApp/CassetteConfiguration.cs
@@ -18,7 +18,7 @@ namespace NzbDrone.Web.Backbone.NzbDrone
         {
             bundles.AddUrlWithAlias<StylesheetBundle>("//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,400,600,300'", FONTS);
 
-            //bundles.AddPerSubDirectory<StylesheetBundle>("Backbone.NzbDrone");
+            bundles.AddPerIndividualFile<ScriptBundle>(APP_PATH);
 
             bundles.Add<StylesheetBundle>(BASE_STYLE, new[]{
                 APP_PATH + "\\Content\\Bootstrap\\bootstrap.less",
@@ -28,20 +28,20 @@ namespace NzbDrone.Web.Backbone.NzbDrone
             },
                 bundle => bundle.AddReference("/" + FONTS));
 
-            bundles.Add<ScriptBundle>(BACKBONE, new[]{
-                      APP_PATH + "\\JsLibraries\\jquery-1.8.2.js",
-                      APP_PATH + "\\JsLibraries\\bootstrap.js",
-                      APP_PATH + "\\JsLibraries\\underscore.js",
-                      APP_PATH + "\\JsLibraries\\backbone.js",
-                      APP_PATH + "\\JsLibraries\\backbone.marionette.js",
-                      APP_PATH + "\\JsLibraries\\backbone.marionette.extend.js",
+
+
+            bundles.Add<ScriptBundle>(NZBDRONE, new[]{
+                      APP_PATH + "\\AddSeries\\AddSeriesLayout.js",
+
             
             });
 
-            bundles.Add<ScriptBundle>(NZBDRONE, new[]{
-                     APP_PATH + "\\app.js",
-                     APP_PATH + "\\AddSeries\\addSeriesView.js"},
-                 bundle => bundle.AddReference("/" + BACKBONE));
+/*            bundles.Add<ScriptBundle>(NZBDRONE, new[]{
+     
+                 },
+               bundle => bundle.AddReference("/" + BACKBONE));*/
+
+
         }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Web/_backboneApp/app.js b/NzbDrone.Web/_backboneApp/app.js
index 944186fcb..d5383578e 100644
--- a/NzbDrone.Web/_backboneApp/app.js
+++ b/NzbDrone.Web/_backboneApp/app.js
@@ -1,4 +1,14 @@
-NzbDrone = new Backbone.Marionette.Application();
+/// <reference path="JsLibraries/jquery-1.8.2.js" />
+/// <reference path="JsLibraries/underscore.js" />
+/// <reference path="JsLibraries/backbone.js" />
+/// <reference path="JsLibraries/backbone.marionette.js" />
+/// <reference path="JsLibraries/backbone.marionette.extend.js" />
+/// <reference path="JsLibraries/bootstrap.js" />
+
+
+
+NzbDrone = new Backbone.Marionette.Application();
+NzbDrone.AddSeries = NzbDrone.module("AddSeries");
 
 NzbDrone.Constants = {
 
@@ -21,7 +31,7 @@ NzbDrone.Routes = {
 NzbDrone.Controller = Backbone.Marionette.Controller.extend({
 
     addSeries: function () {
-        NzbDrone.mainRegion.show(new NzbDrone.AddSeriesLayout());
+        NzbDrone.mainRegion.show(new NzbDrone.AddSeries.AddNewSeriesView());
     },