lib/caboodle/config.rb in caboodle-0.1.0 vs lib/caboodle/config.rb in caboodle-0.1.1

@@ -1,12 +1,12 @@
-module Caboodle
-  MenuItems = []
-  Defaults = Hashie::Mash.new()
-  Site = Defaults.clone
-  RequiredSettings = Hashie::Mash.new()
+module Caboodle  
   Kits = []
+  MenuItems = []
   Javascripts = []
   Stylesheets = []
+  Defaults = Hashie::Mash.new()
+  RequiredSettings = Hashie::Mash.new()
+  Site = Defaults.clone
   Site.required_settings = []
   Site.kits = [] unless Site.kits
-  Defaults.merge!(Hashie::Mash.new(YAML.load_file(File.join( File.join(File.dirname(__FILE__), 'defaults.yml')))))
+  Defaults.merge!(Hashie::Mash.new(YAML.load_file(File.join( File.join(File.dirname(__FILE__), 'config','defaults.yml')))))
 end
\ No newline at end of file