diff --git a/Rakefile b/Rakefile
index 9abac452..ed1fd886 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,4 +7,11 @@ unless ENV["JASMINE_BROWSER"] == 'phantomjs'
 end
 load "jasmine/tasks/jasmine.rake"
 
+namespace :jasmine do
+  task :set_env do
+    ENV['JASMINE_CONFIG_PATH'] = 'spec/support/jasmine.yml'
+  end
+end
+
+task "jasmine:configure" => "jasmine:set_env"
 
diff --git a/spec/javascripts/console/ConsoleReporterSpec.js b/spec/console/ConsoleReporterSpec.js
similarity index 100%
rename from spec/javascripts/console/ConsoleReporterSpec.js
rename to spec/console/ConsoleReporterSpec.js
diff --git a/spec/javascripts/core/AnySpec.js b/spec/core/AnySpec.js
similarity index 100%
rename from spec/javascripts/core/AnySpec.js
rename to spec/core/AnySpec.js
diff --git a/spec/javascripts/core/CallTrackerSpec.js b/spec/core/CallTrackerSpec.js
similarity index 100%
rename from spec/javascripts/core/CallTrackerSpec.js
rename to spec/core/CallTrackerSpec.js
diff --git a/spec/javascripts/core/ClockSpec.js b/spec/core/ClockSpec.js
similarity index 100%
rename from spec/javascripts/core/ClockSpec.js
rename to spec/core/ClockSpec.js
diff --git a/spec/javascripts/core/CustomMatchersSpec.js b/spec/core/CustomMatchersSpec.js
similarity index 100%
rename from spec/javascripts/core/CustomMatchersSpec.js
rename to spec/core/CustomMatchersSpec.js
diff --git a/spec/javascripts/core/DelayedFunctionSchedulerSpec.js b/spec/core/DelayedFunctionSchedulerSpec.js
similarity index 100%
rename from spec/javascripts/core/DelayedFunctionSchedulerSpec.js
rename to spec/core/DelayedFunctionSchedulerSpec.js
diff --git a/spec/javascripts/core/EnvSpec.js b/spec/core/EnvSpec.js
similarity index 100%
rename from spec/javascripts/core/EnvSpec.js
rename to spec/core/EnvSpec.js
diff --git a/spec/javascripts/core/ExceptionFormatterSpec.js b/spec/core/ExceptionFormatterSpec.js
similarity index 100%
rename from spec/javascripts/core/ExceptionFormatterSpec.js
rename to spec/core/ExceptionFormatterSpec.js
diff --git a/spec/javascripts/core/ExceptionsSpec.js b/spec/core/ExceptionsSpec.js
similarity index 100%
rename from spec/javascripts/core/ExceptionsSpec.js
rename to spec/core/ExceptionsSpec.js
diff --git a/spec/javascripts/core/ExpectationResultSpec.js b/spec/core/ExpectationResultSpec.js
similarity index 100%
rename from spec/javascripts/core/ExpectationResultSpec.js
rename to spec/core/ExpectationResultSpec.js
diff --git a/spec/javascripts/core/ExpectationSpec.js b/spec/core/ExpectationSpec.js
similarity index 100%
rename from spec/javascripts/core/ExpectationSpec.js
rename to spec/core/ExpectationSpec.js
diff --git a/spec/javascripts/core/JsApiReporterSpec.js b/spec/core/JsApiReporterSpec.js
similarity index 100%
rename from spec/javascripts/core/JsApiReporterSpec.js
rename to spec/core/JsApiReporterSpec.js
diff --git a/spec/javascripts/core/ObjectContainingSpec.js b/spec/core/ObjectContainingSpec.js
similarity index 100%
rename from spec/javascripts/core/ObjectContainingSpec.js
rename to spec/core/ObjectContainingSpec.js
diff --git a/spec/javascripts/core/PrettyPrintSpec.js b/spec/core/PrettyPrintSpec.js
similarity index 100%
rename from spec/javascripts/core/PrettyPrintSpec.js
rename to spec/core/PrettyPrintSpec.js
diff --git a/spec/javascripts/core/QueueRunnerSpec.js b/spec/core/QueueRunnerSpec.js
similarity index 100%
rename from spec/javascripts/core/QueueRunnerSpec.js
rename to spec/core/QueueRunnerSpec.js
diff --git a/spec/javascripts/core/ReportDispatcherSpec.js b/spec/core/ReportDispatcherSpec.js
similarity index 100%
rename from spec/javascripts/core/ReportDispatcherSpec.js
rename to spec/core/ReportDispatcherSpec.js
diff --git a/spec/javascripts/core/SpecRunningSpec.js b/spec/core/SpecRunningSpec.js
similarity index 100%
rename from spec/javascripts/core/SpecRunningSpec.js
rename to spec/core/SpecRunningSpec.js
diff --git a/spec/javascripts/core/SpecSpec.js b/spec/core/SpecSpec.js
similarity index 100%
rename from spec/javascripts/core/SpecSpec.js
rename to spec/core/SpecSpec.js
diff --git a/spec/javascripts/core/SpySpec.js b/spec/core/SpySpec.js
similarity index 100%
rename from spec/javascripts/core/SpySpec.js
rename to spec/core/SpySpec.js
diff --git a/spec/javascripts/core/SpyStrategySpec.js b/spec/core/SpyStrategySpec.js
similarity index 100%
rename from spec/javascripts/core/SpyStrategySpec.js
rename to spec/core/SpyStrategySpec.js
diff --git a/spec/javascripts/core/SuiteSpec.js b/spec/core/SuiteSpec.js
similarity index 100%
rename from spec/javascripts/core/SuiteSpec.js
rename to spec/core/SuiteSpec.js
diff --git a/spec/javascripts/core/TimerSpec.js b/spec/core/TimerSpec.js
similarity index 100%
rename from spec/javascripts/core/TimerSpec.js
rename to spec/core/TimerSpec.js
diff --git a/spec/javascripts/core/UtilSpec.js b/spec/core/UtilSpec.js
similarity index 100%
rename from spec/javascripts/core/UtilSpec.js
rename to spec/core/UtilSpec.js
diff --git a/spec/javascripts/core/matchers/matchersUtilSpec.js b/spec/core/matchers/matchersUtilSpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/matchersUtilSpec.js
rename to spec/core/matchers/matchersUtilSpec.js
diff --git a/spec/javascripts/core/matchers/toBeCloseToSpec.js b/spec/core/matchers/toBeCloseToSpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toBeCloseToSpec.js
rename to spec/core/matchers/toBeCloseToSpec.js
diff --git a/spec/javascripts/core/matchers/toBeDefinedSpec.js b/spec/core/matchers/toBeDefinedSpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toBeDefinedSpec.js
rename to spec/core/matchers/toBeDefinedSpec.js
diff --git a/spec/javascripts/core/matchers/toBeFalsySpec.js b/spec/core/matchers/toBeFalsySpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toBeFalsySpec.js
rename to spec/core/matchers/toBeFalsySpec.js
diff --git a/spec/javascripts/core/matchers/toBeGreaterThanSpec.js b/spec/core/matchers/toBeGreaterThanSpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toBeGreaterThanSpec.js
rename to spec/core/matchers/toBeGreaterThanSpec.js
diff --git a/spec/javascripts/core/matchers/toBeLessThanSpec.js b/spec/core/matchers/toBeLessThanSpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toBeLessThanSpec.js
rename to spec/core/matchers/toBeLessThanSpec.js
diff --git a/spec/javascripts/core/matchers/toBeNaNSpec.js b/spec/core/matchers/toBeNaNSpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toBeNaNSpec.js
rename to spec/core/matchers/toBeNaNSpec.js
diff --git a/spec/javascripts/core/matchers/toBeNullSpec.js b/spec/core/matchers/toBeNullSpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toBeNullSpec.js
rename to spec/core/matchers/toBeNullSpec.js
diff --git a/spec/javascripts/core/matchers/toBeSpec.js b/spec/core/matchers/toBeSpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toBeSpec.js
rename to spec/core/matchers/toBeSpec.js
diff --git a/spec/javascripts/core/matchers/toBeTruthySpec.js b/spec/core/matchers/toBeTruthySpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toBeTruthySpec.js
rename to spec/core/matchers/toBeTruthySpec.js
diff --git a/spec/javascripts/core/matchers/toBeUndefinedSpec.js b/spec/core/matchers/toBeUndefinedSpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toBeUndefinedSpec.js
rename to spec/core/matchers/toBeUndefinedSpec.js
diff --git a/spec/javascripts/core/matchers/toContainSpec.js b/spec/core/matchers/toContainSpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toContainSpec.js
rename to spec/core/matchers/toContainSpec.js
diff --git a/spec/javascripts/core/matchers/toEqualSpec.js b/spec/core/matchers/toEqualSpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toEqualSpec.js
rename to spec/core/matchers/toEqualSpec.js
diff --git a/spec/javascripts/core/matchers/toHaveBeenCalledSpec.js b/spec/core/matchers/toHaveBeenCalledSpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toHaveBeenCalledSpec.js
rename to spec/core/matchers/toHaveBeenCalledSpec.js
diff --git a/spec/javascripts/core/matchers/toHaveBeenCalledWithSpec.js b/spec/core/matchers/toHaveBeenCalledWithSpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toHaveBeenCalledWithSpec.js
rename to spec/core/matchers/toHaveBeenCalledWithSpec.js
diff --git a/spec/javascripts/core/matchers/toMatchSpec.js b/spec/core/matchers/toMatchSpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toMatchSpec.js
rename to spec/core/matchers/toMatchSpec.js
diff --git a/spec/javascripts/core/matchers/toThrowErrorSpec.js b/spec/core/matchers/toThrowErrorSpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toThrowErrorSpec.js
rename to spec/core/matchers/toThrowErrorSpec.js
diff --git a/spec/javascripts/core/matchers/toThrowSpec.js b/spec/core/matchers/toThrowSpec.js
similarity index 100%
rename from spec/javascripts/core/matchers/toThrowSpec.js
rename to spec/core/matchers/toThrowSpec.js
diff --git a/spec/javascripts/helpers/BrowserFlags.js b/spec/helpers/BrowserFlags.js
similarity index 100%
rename from spec/javascripts/helpers/BrowserFlags.js
rename to spec/helpers/BrowserFlags.js
diff --git a/spec/javascripts/html/HtmlReporterSpec.js b/spec/html/HtmlReporterSpec.js
similarity index 100%
rename from spec/javascripts/html/HtmlReporterSpec.js
rename to spec/html/HtmlReporterSpec.js
diff --git a/spec/javascripts/html/HtmlSpecFilterSpec.js b/spec/html/HtmlSpecFilterSpec.js
similarity index 100%
rename from spec/javascripts/html/HtmlSpecFilterSpec.js
rename to spec/html/HtmlSpecFilterSpec.js
diff --git a/spec/javascripts/html/MatchersHtmlSpec.js b/spec/html/MatchersHtmlSpec.js
similarity index 100%
rename from spec/javascripts/html/MatchersHtmlSpec.js
rename to spec/html/MatchersHtmlSpec.js
diff --git a/spec/javascripts/html/PrettyPrintHtmlSpec.js b/spec/html/PrettyPrintHtmlSpec.js
similarity index 100%
rename from spec/javascripts/html/PrettyPrintHtmlSpec.js
rename to spec/html/PrettyPrintHtmlSpec.js
diff --git a/spec/javascripts/html/QueryStringSpec.js b/spec/html/QueryStringSpec.js
similarity index 100%
rename from spec/javascripts/html/QueryStringSpec.js
rename to spec/html/QueryStringSpec.js
diff --git a/spec/javascripts/html/ResultsNodeSpec.js b/spec/html/ResultsNodeSpec.js
similarity index 100%
rename from spec/javascripts/html/ResultsNodeSpec.js
rename to spec/html/ResultsNodeSpec.js
diff --git a/spec/javascripts/performance/performance_test.js b/spec/performance/performance_test.js
similarity index 100%
rename from spec/javascripts/performance/performance_test.js
rename to spec/performance/performance_test.js
diff --git a/spec/javascripts/support/dev_boot.js b/spec/support/dev_boot.js
similarity index 100%
rename from spec/javascripts/support/dev_boot.js
rename to spec/support/dev_boot.js
diff --git a/spec/javascripts/support/jasmine-performance.yml b/spec/support/jasmine-performance.yml
similarity index 100%
rename from spec/javascripts/support/jasmine-performance.yml
rename to spec/support/jasmine-performance.yml
diff --git a/spec/javascripts/support/jasmine.yml b/spec/support/jasmine.yml
similarity index 91%
rename from spec/javascripts/support/jasmine.yml
rename to spec/support/jasmine.yml
index 262dd8c9..701b4fa5 100644
--- a/spec/javascripts/support/jasmine.yml
+++ b/spec/support/jasmine.yml
@@ -15,13 +15,13 @@ src_files:
   - 'html/**.js'
   - '**/*.js'
 stylesheets:
-boot_dir: 'spec/javascripts/support'
+boot_dir: 'spec/support'
 boot_files:
   - 'dev_boot.js'
 helpers:
   - 'helpers/**/*.js'
 spec_files:
   - '**/*[Ss]pec.js'
-spec_dir:
+spec_dir: spec
 
 
diff --git a/spec/javascripts/support/jasmine_selenium_runner.yml b/spec/support/jasmine_selenium_runner.yml
similarity index 100%
rename from spec/javascripts/support/jasmine_selenium_runner.yml
rename to spec/support/jasmine_selenium_runner.yml