diff --git a/features/step_definitions/bourbon_steps.rb b/features/step_definitions/bourbon_steps.rb
index 266eafdba..dd4c2f079 100644
--- a/features/step_definitions/bourbon_steps.rb
+++ b/features/step_definitions/bourbon_steps.rb
@@ -22,8 +22,10 @@
 end
 
 Then /^the lib files should have been generated$/ do
-  check_file_presence(["bourbon/lib/sass_extensions.rb"], true)
-  check_directory_presence(["bourbon/lib/sass_extensions"], true)
+  check_file_presence(["bourbon/lib/bourbon.rb"], true)
+  check_directory_presence(["bourbon/lib/bourbon"], true)
+  check_file_presence(["bourbon/lib/bourbon/sass_extensions.rb"], true)
+  check_directory_presence(["bourbon/lib/bourbon/sass_extensions"], true)
 end
 
 Then /^bourbon should not have been generated$/ do
diff --git a/lib/bourbon/generator.rb b/lib/bourbon/generator.rb
index 02867e972..65a27e1c8 100644
--- a/lib/bourbon/generator.rb
+++ b/lib/bourbon/generator.rb
@@ -50,12 +50,13 @@ def remove_bourbon_directory
     end
 
     def make_lib_directory
-      FileUtils.mkdir_p("bourbon/lib")
+      FileUtils.mkdir_p("bourbon/lib/bourbon")
     end
 
     def copy_in_sass_extensions
-      FileUtils.cp(File.join(lib_directory, "sass_extensions.rb"), "bourbon/lib/")
-      FileUtils.cp_r(File.join(lib_directory, "sass_extensions"), "bourbon/lib/")
+      FileUtils.cp(File.join(lib_directory, "bourbon.rb"), "bourbon/lib/")
+      FileUtils.cp(File.join(lib_bourbon_directory, "sass_extensions.rb"), "bourbon/lib/bourbon/")
+      FileUtils.cp_r(File.join(lib_bourbon_directory, "sass_extensions"), "bourbon/lib/bourbon/")
     end
 
     def copy_in_scss_files
@@ -71,6 +72,10 @@ def stylesheets_directory
     end
 
     def lib_directory
+      File.join(top_level_directory, "lib")
+    end
+
+    def lib_bourbon_directory
       File.join(top_level_directory, "lib", "bourbon")
     end