diff --git a/vendor/travis-core/lib/travis.rb b/lib/travis.rb
similarity index 62%
rename from vendor/travis-core/lib/travis.rb
rename to lib/travis.rb
index 7db92f49..a1a1a123 100644
--- a/vendor/travis-core/lib/travis.rb
+++ b/lib/travis.rb
@@ -6,28 +6,9 @@ require 'travis/redis_pool'
 require 'travis/errors'
 require 'travis/commit_command'
 
-# travis-core holds the central parts of the model layer used in both travis-ci
-# (i.e. the web application) as well as travis-hub (a non-rails ui-less JRuby
-# application that receives, processes and distributes messages from/to the
-# workers and issues various events like email, pusher, irc notifications and
-# so on).
-#
-# travis/model   - contains ActiveRecord models that and model the main
-#                  parts of the domain logic (e.g. repository, build, job
-#                  etc.) and issue events on state changes (e.g.
-#                  build:created, job:test:finished etc.)
-# travis/event   - contains event handlers that register for certain
-#                  events and send out such things as email, pusher, irc
-#                  notifications, archive builds or queue jobs for the
-#                  workers.
-#
-# travis-core also contains some helper classes and modules like Travis::Database
-# (needed in travis-hub in order to connect to the database) and Travis::Renderer
-# (our inferior layer on top of Rabl).
 module Travis
   class << self
     def services=(services)
-      # Travis.logger.info("Using services: #{services}")
       @services = services
     end
 
diff --git a/vendor/travis-core/lib/travis/config/database.rb b/lib/travis/config/database.rb
similarity index 100%
rename from vendor/travis-core/lib/travis/config/database.rb
rename to lib/travis/config/database.rb
diff --git a/vendor/travis-core/lib/travis/config/defaults.rb b/lib/travis/config/defaults.rb
similarity index 100%
rename from vendor/travis-core/lib/travis/config/defaults.rb
rename to lib/travis/config/defaults.rb
diff --git a/vendor/travis-core/lib/travis/config/url.rb b/lib/travis/config/url.rb
similarity index 100%
rename from vendor/travis-core/lib/travis/config/url.rb
rename to lib/travis/config/url.rb