diff --git a/lib/nesta.rb b/lib/nesta.rb
index 2b615191..05984ac4 100644
--- a/lib/nesta.rb
+++ b/lib/nesta.rb
@@ -1 +1,9 @@
+module Nesta
+  def self.deprecated(name, message)
+    if Nesta::App.environment != :test
+      $stderr.puts "DEPRECATION WARNING: #{name} is deprecated; #{message}"
+    end
+  end
+end
+
 require "nesta/plugin"
diff --git a/lib/nesta/app.rb b/lib/nesta/app.rb
index 4f9e70ac..7500fb5e 100644
--- a/lib/nesta/app.rb
+++ b/lib/nesta/app.rb
@@ -2,8 +2,8 @@
 require 'haml'
 require 'sass'
 
+require File.expand_path('../nesta', File.dirname(__FILE__))
 require File.expand_path('env', File.dirname(__FILE__))
-require File.expand_path('nesta', File.dirname(__FILE__))
 require File.expand_path('cache', File.dirname(__FILE__))
 require File.expand_path('config', File.dirname(__FILE__))
 require File.expand_path('models', File.dirname(__FILE__))
@@ -11,7 +11,6 @@
 require File.expand_path('navigation', File.dirname(__FILE__))
 require File.expand_path('overrides', File.dirname(__FILE__))
 require File.expand_path('path', File.dirname(__FILE__))
-require File.expand_path('plugin', File.dirname(__FILE__))
 
 Encoding.default_external = 'utf-8' if RUBY_VERSION =~ /^1.9/
 
diff --git a/lib/nesta/nesta.rb b/lib/nesta/nesta.rb
deleted file mode 100644
index 9805be13..00000000
--- a/lib/nesta/nesta.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Nesta
-  def self.deprecated(name, message)
-    if Nesta::App.environment != :test
-      $stderr.puts "DEPRECATION WARNING: #{name} is deprecated; #{message}"
-    end
-  end
-end