diff --git a/assets/scripts/app/routes/abstract-builds.coffee b/assets/scripts/app/routes/abstract-builds.coffee
index 8be8dcc2..a6e289d9 100644
--- a/assets/scripts/app/routes/abstract-builds.coffee
+++ b/assets/scripts/app/routes/abstract-builds.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   renderTemplate: ->
diff --git a/assets/scripts/app/routes/account.coffee b/assets/scripts/app/routes/account.coffee
index 6d57970a..bd0ea80d 100644
--- a/assets/scripts/app/routes/account.coffee
+++ b/assets/scripts/app/routes/account.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   setupController: (controller, account) ->
diff --git a/assets/scripts/app/routes/accounts.coffee b/assets/scripts/app/routes/accounts.coffee
index 55f24d7a..7a24adcb 100644
--- a/assets/scripts/app/routes/accounts.coffee
+++ b/assets/scripts/app/routes/accounts.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   model: ->
diff --git a/assets/scripts/app/routes/accounts/index.coffee b/assets/scripts/app/routes/accounts/index.coffee
index 2cff27a1..18da917d 100644
--- a/assets/scripts/app/routes/accounts/index.coffee
+++ b/assets/scripts/app/routes/accounts/index.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   redirect: ->
diff --git a/assets/scripts/app/routes/accounts/info.coffee b/assets/scripts/app/routes/accounts/info.coffee
index 5ae60a67..f10ab33e 100644
--- a/assets/scripts/app/routes/accounts/info.coffee
+++ b/assets/scripts/app/routes/accounts/info.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   setupController: ->
diff --git a/assets/scripts/app/routes/application.coffee b/assets/scripts/app/routes/application.coffee
index 6674e6f5..d594f846 100644
--- a/assets/scripts/app/routes/application.coffee
+++ b/assets/scripts/app/routes/application.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   needsAuth: false
diff --git a/assets/scripts/app/routes/auth.coffee b/assets/scripts/app/routes/auth.coffee
index c3193a6f..3d231243 100644
--- a/assets/scripts/app/routes/auth.coffee
+++ b/assets/scripts/app/routes/auth.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   needsAuth: false
diff --git a/assets/scripts/app/routes/basic.coffee b/assets/scripts/app/routes/basic.coffee
index c67da07f..318896f2 100644
--- a/assets/scripts/app/routes/basic.coffee
+++ b/assets/scripts/app/routes/basic.coffee
@@ -18,4 +18,4 @@ Route = Ember.Route.extend
     config.pro
   ).property()
 
-Travis.Route = Route
+Travis.BasicRoute = Route
diff --git a/assets/scripts/app/routes/branches.coffee b/assets/scripts/app/routes/branches.coffee
index b7059dbb..9fbb2915 100644
--- a/assets/scripts/app/routes/branches.coffee
+++ b/assets/scripts/app/routes/branches.coffee
@@ -1,4 +1,4 @@
-require 'routes/route'
+require 'routes/basic'
 
 AbstractBuildsRoute = Travis.AbstractBuildsRoute
 
diff --git a/assets/scripts/app/routes/build.coffee b/assets/scripts/app/routes/build.coffee
index b709676b..d428b47d 100644
--- a/assets/scripts/app/routes/build.coffee
+++ b/assets/scripts/app/routes/build.coffee
@@ -1,7 +1,7 @@
-require 'routes/route'
+require 'routes/basic'
 require 'models/build'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   serialize: (model, params) ->
diff --git a/assets/scripts/app/routes/builds.coffee b/assets/scripts/app/routes/builds.coffee
index 140145b6..ec159cb9 100644
--- a/assets/scripts/app/routes/builds.coffee
+++ b/assets/scripts/app/routes/builds.coffee
@@ -1,4 +1,4 @@
-require 'routes/route'
+require 'routes/basic'
 
 AbstractBuildsRoute = Travis.AbstractBuildsRoute
 
diff --git a/assets/scripts/app/routes/caches.coffee b/assets/scripts/app/routes/caches.coffee
index 1f4c3ddc..5337baa2 100644
--- a/assets/scripts/app/routes/caches.coffee
+++ b/assets/scripts/app/routes/caches.coffee
@@ -1,10 +1,10 @@
-require 'routes/route'
+require 'routes/basic'
 require 'models/request'
 require 'utils/ajax'
 
 Request = Travis.Request
 Ajax = Travis.ajax
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   needsAuth: true
diff --git a/assets/scripts/app/routes/dashboard.coffee b/assets/scripts/app/routes/dashboard.coffee
index 8190e2c9..6df3ccce 100644
--- a/assets/scripts/app/routes/dashboard.coffee
+++ b/assets/scripts/app/routes/dashboard.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   needsAuth: true
diff --git a/assets/scripts/app/routes/dashboard/repositories.coffee b/assets/scripts/app/routes/dashboard/repositories.coffee
index 20732f44..5ae0d3a5 100644
--- a/assets/scripts/app/routes/dashboard/repositories.coffee
+++ b/assets/scripts/app/routes/dashboard/repositories.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   queryParams:
diff --git a/assets/scripts/app/routes/env-vars.coffee b/assets/scripts/app/routes/env-vars.coffee
index 9f49908b..5bf782f3 100644
--- a/assets/scripts/app/routes/env-vars.coffee
+++ b/assets/scripts/app/routes/env-vars.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   model: (params) ->
diff --git a/assets/scripts/app/routes/first-sync.coffee b/assets/scripts/app/routes/first-sync.coffee
index 88327de2..0ce66725 100644
--- a/assets/scripts/app/routes/first-sync.coffee
+++ b/assets/scripts/app/routes/first-sync.coffee
@@ -1,4 +1,4 @@
-require 'routes/route'
+require 'routes/basic'
 require 'routes/simple-layout'
 require 'models/repo'
 
diff --git a/assets/scripts/app/routes/getting-started.coffee b/assets/scripts/app/routes/getting-started.coffee
index 49022ca8..8037b668 100644
--- a/assets/scripts/app/routes/getting-started.coffee
+++ b/assets/scripts/app/routes/getting-started.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend()
 
diff --git a/assets/scripts/app/routes/insufficient-oauth-permissions.coffee b/assets/scripts/app/routes/insufficient-oauth-permissions.coffee
index a1338f23..d509cc0d 100644
--- a/assets/scripts/app/routes/insufficient-oauth-permissions.coffee
+++ b/assets/scripts/app/routes/insufficient-oauth-permissions.coffee
@@ -1,4 +1,4 @@
-require 'routes/route'
+require 'routes/basic'
 require 'routes/simple-layout'
 
 SimpleLayoutRoute = Travis.SimpleLayoutRoute
diff --git a/assets/scripts/app/routes/job.coffee b/assets/scripts/app/routes/job.coffee
index d76975d0..9edceed0 100644
--- a/assets/scripts/app/routes/job.coffee
+++ b/assets/scripts/app/routes/job.coffee
@@ -1,7 +1,7 @@
-require 'routes/route'
+require 'routes/basic'
 require 'models/job'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   serialize: (model, params) ->
diff --git a/assets/scripts/app/routes/main-tab.coffee b/assets/scripts/app/routes/main-tab.coffee
index 28c4872f..9f2c0d2a 100644
--- a/assets/scripts/app/routes/main-tab.coffee
+++ b/assets/scripts/app/routes/main-tab.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   renderTemplate: ->
diff --git a/assets/scripts/app/routes/main.coffee b/assets/scripts/app/routes/main.coffee
index 6471a86a..c61d7956 100644
--- a/assets/scripts/app/routes/main.coffee
+++ b/assets/scripts/app/routes/main.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 config = ENV.config
 
 Route = TravisRoute.extend
diff --git a/assets/scripts/app/routes/main/index.coffee b/assets/scripts/app/routes/main/index.coffee
index d1cc2ced..0b5e69ba 100644
--- a/assets/scripts/app/routes/main/index.coffee
+++ b/assets/scripts/app/routes/main/index.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   redirect: ->
diff --git a/assets/scripts/app/routes/main/my-repositories.coffee b/assets/scripts/app/routes/main/my-repositories.coffee
index 29250a73..8f5b4ac3 100644
--- a/assets/scripts/app/routes/main/my-repositories.coffee
+++ b/assets/scripts/app/routes/main/my-repositories.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   redirect: ->
diff --git a/assets/scripts/app/routes/main/recent.coffee b/assets/scripts/app/routes/main/recent.coffee
index 3a8fe7f6..b14fc8d1 100644
--- a/assets/scripts/app/routes/main/recent.coffee
+++ b/assets/scripts/app/routes/main/recent.coffee
@@ -1,4 +1,4 @@
-require 'routes/route'
+require 'routes/basic'
 require 'routes/main-tab'
 
 MainTabRoute = Travis.MainTabRoute
diff --git a/assets/scripts/app/routes/main/repositories.coffee b/assets/scripts/app/routes/main/repositories.coffee
index 20d90a3f..5546f360 100644
--- a/assets/scripts/app/routes/main/repositories.coffee
+++ b/assets/scripts/app/routes/main/repositories.coffee
@@ -1,4 +1,4 @@
-require 'routes/route'
+require 'routes/basic'
 require 'routes/main-tab'
 
 MainTabRoute = Travis.MainTabRoute
diff --git a/assets/scripts/app/routes/main/search.coffee b/assets/scripts/app/routes/main/search.coffee
index 0daf6298..9ec2bc6b 100644
--- a/assets/scripts/app/routes/main/search.coffee
+++ b/assets/scripts/app/routes/main/search.coffee
@@ -1,4 +1,4 @@
-require 'routes/route'
+require 'routes/basic'
 require 'routes/main-tab'
 
 MainTabRoute = Travis.MainTabRoute
diff --git a/assets/scripts/app/routes/not-found.coffee b/assets/scripts/app/routes/not-found.coffee
index 49feb919..f81a2e5c 100644
--- a/assets/scripts/app/routes/not-found.coffee
+++ b/assets/scripts/app/routes/not-found.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   renderTemplate: ->
diff --git a/assets/scripts/app/routes/profile.coffee b/assets/scripts/app/routes/profile.coffee
index be14a502..23e88170 100644
--- a/assets/scripts/app/routes/profile.coffee
+++ b/assets/scripts/app/routes/profile.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   needsAuth: true
diff --git a/assets/scripts/app/routes/pull-requests.coffee b/assets/scripts/app/routes/pull-requests.coffee
index cf908fbf..9c979dc7 100644
--- a/assets/scripts/app/routes/pull-requests.coffee
+++ b/assets/scripts/app/routes/pull-requests.coffee
@@ -1,4 +1,4 @@
-require 'routes/route'
+require 'routes/basic'
 
 AbstractBuildsRoute = Travis.AbstractBuildsRoute
 
diff --git a/assets/scripts/app/routes/repo.coffee b/assets/scripts/app/routes/repo.coffee
index 699b022f..b8e26400 100644
--- a/assets/scripts/app/routes/repo.coffee
+++ b/assets/scripts/app/routes/repo.coffee
@@ -1,8 +1,8 @@
-require 'routes/route'
+require 'routes/basic'
 require 'models/repo'
 
 Repo = Travis.Repo
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   renderTemplate: ->
diff --git a/assets/scripts/app/routes/repo/index.coffee b/assets/scripts/app/routes/repo/index.coffee
index 3d8257b3..c8770ee7 100644
--- a/assets/scripts/app/routes/repo/index.coffee
+++ b/assets/scripts/app/routes/repo/index.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   setupController: (controller, model) ->
diff --git a/assets/scripts/app/routes/request.coffee b/assets/scripts/app/routes/request.coffee
index 540303a9..d9b0a5f6 100644
--- a/assets/scripts/app/routes/request.coffee
+++ b/assets/scripts/app/routes/request.coffee
@@ -1,7 +1,7 @@
-require 'routes/route'
+require 'routes/basic'
 require 'models/request'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   setupController: ->
diff --git a/assets/scripts/app/routes/requests.coffee b/assets/scripts/app/routes/requests.coffee
index 2b41e053..195d61c4 100644
--- a/assets/scripts/app/routes/requests.coffee
+++ b/assets/scripts/app/routes/requests.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   needsAuth: true
diff --git a/assets/scripts/app/routes/settings.coffee b/assets/scripts/app/routes/settings.coffee
index 17513bb5..5318fe2d 100644
--- a/assets/scripts/app/routes/settings.coffee
+++ b/assets/scripts/app/routes/settings.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   needsAuth: true
diff --git a/assets/scripts/app/routes/settings/index.coffee b/assets/scripts/app/routes/settings/index.coffee
index bcee0222..dad7b55a 100644
--- a/assets/scripts/app/routes/settings/index.coffee
+++ b/assets/scripts/app/routes/settings/index.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   model: ->
diff --git a/assets/scripts/app/routes/simple-layout.coffee b/assets/scripts/app/routes/simple-layout.coffee
index dcb806a7..8cf24c90 100644
--- a/assets/scripts/app/routes/simple-layout.coffee
+++ b/assets/scripts/app/routes/simple-layout.coffee
@@ -1,6 +1,6 @@
-require 'routes/route'
+require 'routes/basic'
 
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   setupController: ->
diff --git a/assets/scripts/app/routes/ssh-key.coffee b/assets/scripts/app/routes/ssh-key.coffee
index 42d9b47f..a1005137 100644
--- a/assets/scripts/app/routes/ssh-key.coffee
+++ b/assets/scripts/app/routes/ssh-key.coffee
@@ -1,10 +1,10 @@
-require 'routes/route'
+require 'routes/basic'
 require 'models/ssh-key'
 require 'utils/ajax'
 
 SshKey = Travis.SshKey
 Ajax = Travis.ajax
-TravisRoute = Travis.Route
+TravisRoute = Travis.BasicRoute
 
 Route = TravisRoute.extend
   model: (params) ->
diff --git a/assets/scripts/app/views/accounts.coffee b/assets/scripts/app/views/accounts.coffee
index 3713eaf4..5d479445 100644
--- a/assets/scripts/app/views/accounts.coffee
+++ b/assets/scripts/app/views/accounts.coffee
@@ -1,5 +1,5 @@
 @Travis.reopen
-  ProfileAccountsView: Travis.View.extend
+  ProfileAccountsView: Travis.BasicView.extend
     tabBinding: 'controller.tab'
     templateName: 'profile/accounts'
     classAccounts: (->
@@ -14,7 +14,7 @@
     emptyView: Ember.View.extend
       template: Ember.Handlebars.compile('<div class="loading"><span>Loading</span></div>')
 
-    itemViewClass: Travis.View.extend
+    itemViewClass: Travis.BasicView.extend
       accountBinding: 'content'
       typeBinding: 'content.type'
       selectedBinding: 'account.selected'
diff --git a/assets/scripts/app/views/annotation.coffee b/assets/scripts/app/views/annotation.coffee
index 712f10a0..b3afe483 100644
--- a/assets/scripts/app/views/annotation.coffee
+++ b/assets/scripts/app/views/annotation.coffee
@@ -1,4 +1,4 @@
 Travis.reopen
-  AnnotationsView: Travis.View.extend
+  AnnotationsView: Travis.BasicView.extend
     templateName: 'annotations/list'
 
diff --git a/assets/scripts/app/views/annotations.coffee b/assets/scripts/app/views/annotations.coffee
index 556ee80f..ac8376a0 100644
--- a/assets/scripts/app/views/annotations.coffee
+++ b/assets/scripts/app/views/annotations.coffee
@@ -1,2 +1,2 @@
 Travis.reopen
-  AnnotationsView: Travis.View.extend
+  AnnotationsView: Travis.BasicView.extend
diff --git a/assets/scripts/app/views/application.coffee b/assets/scripts/app/views/application.coffee
index 4fda64be..fd595908 100644
--- a/assets/scripts/app/views/application.coffee
+++ b/assets/scripts/app/views/application.coffee
@@ -1,5 +1,5 @@
 Travis.reopen
-  ApplicationView: Travis.View.extend
+  ApplicationView: Travis.BasicView.extend
     classNames: ['application']
     click: (event) ->
       # TODO: this solves the case of closing menus and popups,
diff --git a/assets/scripts/app/views/application/loading.coffee b/assets/scripts/app/views/application/loading.coffee
index e88ea100..1d75faac 100644
--- a/assets/scripts/app/views/application/loading.coffee
+++ b/assets/scripts/app/views/application/loading.coffee
@@ -1,6 +1,6 @@
-require 'views/view'
+require 'views/basic'
 
-TravisView = Travis.View
+TravisView = Travis.BasicView
 
 View = TravisView.extend()
 
diff --git a/assets/scripts/app/views/view.coffee b/assets/scripts/app/views/basic.coffee
similarity index 77%
rename from assets/scripts/app/views/view.coffee
rename to assets/scripts/app/views/basic.coffee
index 4ae0ec60..2404a0ce 100644
--- a/assets/scripts/app/views/view.coffee
+++ b/assets/scripts/app/views/basic.coffee
@@ -10,10 +10,10 @@ View = Ember.View.extend
   popupClose: ->
     $('.popup').removeClass('display')
   popupCloseAll: ->
-    if view = Travis.View.currentPopupView
+    if view = Ember.View.currentPopupView
       view.destroy()
-      Travis.View.currentPopupView = null
+      Ember.View.currentPopupView = null
 
     $('.popup').removeClass('display')
 
-Travis.View = View
+Travis.BasicView = View
diff --git a/assets/scripts/app/views/build.coffee b/assets/scripts/app/views/build.coffee
index 89bd39cf..1ef531c9 100644
--- a/assets/scripts/app/views/build.coffee
+++ b/assets/scripts/app/views/build.coffee
@@ -1,6 +1,6 @@
 colorForState = Travis.Helpers.colorForState
 
-View = Travis.View.extend
+View = Travis.BasicView.extend
     classNameBindings: ['color', 'loading']
     buildBinding: 'controller.build'
     loadingBinding: 'controller.loading'
diff --git a/assets/scripts/app/views/dashboard.coffee b/assets/scripts/app/views/dashboard.coffee
index 186415df..3cc467af 100644
--- a/assets/scripts/app/views/dashboard.coffee
+++ b/assets/scripts/app/views/dashboard.coffee
@@ -1,6 +1,6 @@
-require 'views/view'
+require 'views/basic'
 
-TravisView = Travis.View
+TravisView = Travis.BasicView
 
 View = TravisView.extend
   layoutName: 'layouts/dashboard'
diff --git a/assets/scripts/app/views/first-sync.coffee b/assets/scripts/app/views/first-sync.coffee
index eb5a266a..88c61a0f 100644
--- a/assets/scripts/app/views/first-sync.coffee
+++ b/assets/scripts/app/views/first-sync.coffee
@@ -1,4 +1,4 @@
-View = Travis.View.extend
+View = Travis.BasicView.extend
   layoutName: 'layouts/simple'
 
 Travis.FirstSyncView = View
diff --git a/assets/scripts/app/views/flash.coffee b/assets/scripts/app/views/flash.coffee
index 3901b187..b1fe7451 100644
--- a/assets/scripts/app/views/flash.coffee
+++ b/assets/scripts/app/views/flash.coffee
@@ -1,10 +1,10 @@
 @Travis.reopen
-  FlashView: Travis.View.extend
+  FlashView: Travis.BasicView.extend
     classNames: ['flash']
     tagName: 'ul'
     templateName: 'layouts/flash'
 
-  FlashItemView: Travis.View.extend
+  FlashItemView: Travis.BasicView.extend
     tagName: 'li'
     classNameBindings: ['type']
 
diff --git a/assets/scripts/app/views/insufficient-oauth-permissions.coffee b/assets/scripts/app/views/insufficient-oauth-permissions.coffee
index d7943de2..9036a417 100644
--- a/assets/scripts/app/views/insufficient-oauth-permissions.coffee
+++ b/assets/scripts/app/views/insufficient-oauth-permissions.coffee
@@ -1,4 +1,4 @@
-View = Travis.View.extend
+View = Travis.BasicView.extend
   layoutName: 'layouts/simple'
 
 Travis.InsufficientOauthPermissionsView = View
diff --git a/assets/scripts/app/views/jobs-item.coffee b/assets/scripts/app/views/jobs-item.coffee
index 59ae69b4..77fff83d 100644
--- a/assets/scripts/app/views/jobs-item.coffee
+++ b/assets/scripts/app/views/jobs-item.coffee
@@ -1,4 +1,4 @@
-View = Travis.View.extend
+View = Travis.BasicView.extend
     tagName: 'tr'
     classNameBindings: ['color']
     repoBinding: 'context.repo'
diff --git a/assets/scripts/app/views/left.coffee b/assets/scripts/app/views/left.coffee
index f79cf82a..02c9eba9 100644
--- a/assets/scripts/app/views/left.coffee
+++ b/assets/scripts/app/views/left.coffee
@@ -1,5 +1,5 @@
 @Travis.reopen
-  ReposView: Travis.View.extend
+  ReposView: Travis.BasicView.extend
     templateName: 'repos/list'
     tabBinding: 'controller.tab'
 
diff --git a/assets/scripts/app/views/log.coffee b/assets/scripts/app/views/log.coffee
index b03616f9..c0241462 100644
--- a/assets/scripts/app/views/log.coffee
+++ b/assets/scripts/app/views/log.coffee
@@ -8,7 +8,7 @@ Log.LIMIT = 10000
 config = ENV.config
 
 Travis.reopen
-  LogView: Travis.View.extend
+  LogView: Travis.BasicView.extend
     templateName: 'jobs/log'
     logBinding: 'job.log'
 
diff --git a/assets/scripts/app/views/main.coffee b/assets/scripts/app/views/main.coffee
index 895f4686..19b6bf91 100644
--- a/assets/scripts/app/views/main.coffee
+++ b/assets/scripts/app/views/main.coffee
@@ -1,4 +1,4 @@
-View = Travis.View.extend
+View = Travis.BasicView.extend
   layoutName: 'layouts/home'
   classNames: ['main']
 
diff --git a/assets/scripts/app/views/profile.coffee b/assets/scripts/app/views/profile.coffee
index fc1c66b6..dadf0518 100644
--- a/assets/scripts/app/views/profile.coffee
+++ b/assets/scripts/app/views/profile.coffee
@@ -1,5 +1,5 @@
 Travis.reopen
-  ProfileView: Travis.View.extend
+  ProfileView: Travis.BasicView.extend
     templateName: 'profile/show'
     layoutName: 'layouts/profile'
     classNames: ['profile-view']
@@ -11,7 +11,7 @@ Travis.reopen
       @get('account.name') || @get('account.login')
     ).property('account.name', 'account.login')
 
-  ProfileTabsView: Travis.View.extend
+  ProfileTabsView: Travis.BasicView.extend
     templateName: 'profile/tabs'
     tabBinding: 'controller.tab'
 
@@ -30,7 +30,7 @@ Travis.reopen
       @get('controller.account.login') == @get('controller.user.login')
     ).property('controller.account.login', 'controller.user.login')
 
-  HooksView: Travis.View.extend
+  HooksView: Travis.BasicView.extend
     templateName: 'profile/tabs/hooks'
     userBinding: 'controller.user'
 
@@ -38,7 +38,7 @@ Travis.reopen
       Travis.Urls.githubAdmin(@get('hook.slug'))
     ).property('hook.slug')
 
-  AccountsInfoView: Travis.View.extend
+  AccountsInfoView: Travis.BasicView.extend
     templateName: 'profile/tabs/user'
     userBinding: 'controller.user'
 
diff --git a/assets/scripts/app/views/repo-actions.coffee b/assets/scripts/app/views/repo-actions.coffee
index 3d8a5b58..2dd9db61 100644
--- a/assets/scripts/app/views/repo-actions.coffee
+++ b/assets/scripts/app/views/repo-actions.coffee
@@ -1,6 +1,6 @@
 config = ENV.config
 
-View = Travis.View.extend
+View = Travis.BasicView.extend
   templateName: 'repos/show/actions'
 
   repoBinding: 'controller.repo'
diff --git a/assets/scripts/app/views/repo-show-tabs.coffee b/assets/scripts/app/views/repo-show-tabs.coffee
index cd6fa149..b5502e4c 100644
--- a/assets/scripts/app/views/repo-show-tabs.coffee
+++ b/assets/scripts/app/views/repo-show-tabs.coffee
@@ -1,4 +1,4 @@
-View = Travis.View.extend
+View = Travis.BasicView.extend
   templateName: 'repos/show/tabs'
 
   tabBinding: 'controller.tab'
diff --git a/assets/scripts/app/views/repo-show-tools.coffee b/assets/scripts/app/views/repo-show-tools.coffee
index 3b5e7833..05698c3f 100644
--- a/assets/scripts/app/views/repo-show-tools.coffee
+++ b/assets/scripts/app/views/repo-show-tools.coffee
@@ -1,4 +1,4 @@
-View = Travis.View.extend
+View = Travis.BasicView.extend
   templateName: 'repos/show/tools'
 
   repoBinding: 'controller.repo'
diff --git a/assets/scripts/app/views/repo.coffee b/assets/scripts/app/views/repo.coffee
index 5b8f0c48..9f8c309d 100644
--- a/assets/scripts/app/views/repo.coffee
+++ b/assets/scripts/app/views/repo.coffee
@@ -2,7 +2,7 @@ statusImage = Travis.Urls.statusImage
 StatusImagesView = Travis.StatusImagesView
 config = ENV.config
 
-View = Travis.View.extend
+View = Travis.BasicView.extend
   reposBinding: 'controllers.repos'
   repoBinding: 'controller.repo'
   buildBinding: 'controller.build'
@@ -23,11 +23,11 @@ View = Travis.View.extend
     statusImages: () ->
       @popupCloseAll()
       view = StatusImagesView.create(toolsView: this)
-      Travis.View.currentPopupView = view
+      Travis.BasicView.currentPopupView = view
       view.appendTo($('body'))
       return false
 
-  ReposEmptyView: Travis.View.extend
+  ReposEmptyView: Travis.BasicView.extend
     template: (->
       if config.pro
         'pro/repos/show/empty'
diff --git a/assets/scripts/app/views/repos-list-tabs.coffee b/assets/scripts/app/views/repos-list-tabs.coffee
index 7df35729..271ea79f 100644
--- a/assets/scripts/app/views/repos-list-tabs.coffee
+++ b/assets/scripts/app/views/repos-list-tabs.coffee
@@ -1,4 +1,4 @@
-View = Travis.View.extend
+View = Travis.BasicView.extend
   templateName: 'repos/list/tabs'
   tabBinding: 'controller.tab'
   currentUserBinding: 'controller.currentUser.id'
diff --git a/assets/scripts/app/views/repos-list.coffee b/assets/scripts/app/views/repos-list.coffee
index d4fc21a0..4d38d6ba 100644
--- a/assets/scripts/app/views/repos-list.coffee
+++ b/assets/scripts/app/views/repos-list.coffee
@@ -7,7 +7,7 @@ View = Em.CollectionView.extend
   emptyView: Ember.View.extend
     template: Ember.Handlebars.compile('<div class="loading"><span>Loading</span></div>')
 
-  itemViewClass: Travis.View.extend
+  itemViewClass: Travis.BasicView.extend
     repoBinding: 'content'
     classNames: ['repo']
     classNameBindings: ['color', 'selected']
diff --git a/assets/scripts/app/views/signin.coffee b/assets/scripts/app/views/signin.coffee
index 1dc06001..3365fcfa 100644
--- a/assets/scripts/app/views/signin.coffee
+++ b/assets/scripts/app/views/signin.coffee
@@ -1,3 +1,3 @@
 @Travis.reopen
-  SigninView: Travis.View.extend
+  SigninView: Travis.BasicView.extend
     templateName: 'auth/signin'
diff --git a/assets/scripts/app/views/stats.coffee b/assets/scripts/app/views/stats.coffee
index da7e1498..7043e232 100644
--- a/assets/scripts/app/views/stats.coffee
+++ b/assets/scripts/app/views/stats.coffee
@@ -1,5 +1,5 @@
 @Travis.reopen
-  StatsView: Travis.View.extend
+  StatsView: Travis.BasicView.extend
     templateName: 'stats/show'
     didInsertElement: ->
       # @renderChart(config) for name, config of @CHARTS
diff --git a/assets/scripts/app/views/top.coffee b/assets/scripts/app/views/top.coffee
index c1cf09d8..7ddcb7ce 100644
--- a/assets/scripts/app/views/top.coffee
+++ b/assets/scripts/app/views/top.coffee
@@ -1,5 +1,5 @@
 @Travis.reopen
-  TopView: Travis.View.extend
+  TopView: Travis.BasicView.extend
     tabBinding: 'controller.tab'
 
     # hrm. how to parametrize bind-attr?
diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee
index dbcb8ead..b93118c7 100644
--- a/assets/scripts/travis.coffee
+++ b/assets/scripts/travis.coffee
@@ -27,6 +27,7 @@ require 'utils/status-image-formats'
 require 'utils/pusher'
 require 'utils/slider'
 require 'utils/tailing'
+require 'utils/to-top'
 require 'mixins/github-url-properties'
 
 require 'utils/keys-map'
@@ -75,7 +76,7 @@ require 'routes/repo/index'
 require 'routes/repo'
 require 'routes/request'
 require 'routes/requests'
-require 'routes/route'
+require 'routes/basic'
 require 'routes/settings/index'
 require 'routes/settings'
 require 'routes/simple-layout'
@@ -180,7 +181,7 @@ require 'models/user'
 require 'models/env-var'
 require 'models/ssh-key'
 
-require 'views/view'
+require 'views/basic'
 require 'views/accounts'
 require 'views/annotation'
 require 'views/application'