diff --git a/install.php b/install.php
index 89f6c28..67731bf 100644
--- a/install.php
+++ b/install.php
@@ -9,5 +9,8 @@
  ************************************************************************************
  ************************************************************************************/
 
-if (!file_exists('framework') || !file_exists('framework/_config.php')) include "install-frameworkmissing.html";
-else include('./framework/dev/install/install.php');
+if (!file_exists('framework') || !file_exists('framework/_config.php')) {
+	include "install-frameworkmissing.html";
+} else {
+	include('./framework/Dev/Install/install.php');
+}
diff --git a/mysite/_config/config.yml b/mysite/_config/config.yml
index 3beba7e..b77a9b4 100644
--- a/mysite/_config/config.yml
+++ b/mysite/_config/config.yml
@@ -7,9 +7,7 @@ After:
 # YAML configuration for SilverStripe
 # See http://doc.silverstripe.org/framework/en/topics/configuration
 # Caution: Indentation through two spaces, not tabs
-SSViewer:
+SilverStripe\View\SSViewer:
   themes:
     - 'simple'
     - '$default'
-Debug:
-  friendly_error_httpcode: true
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 78d3abf..f1c9aa6 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,15 +1,15 @@
-<!-- 
+<!--
 	PHPUnit configuration for SilverStripe
 
 	Requires PHPUnit 3.5+
 
-	Usage: 
+	Usage:
 	 - "phpunit": Runs all tests in all folders
 	 - "phpunit framework/tests/": Run all tests of the framework module
 	 - "phpunit framework/tests/filesystem": Run all filesystem tests within the framework module
 	 - "phpunit framework/tests/filesystem/FolderTest.php": Run a single test
 	 - "phpunit <dash><dash>coverage-html assets/": Generate coverage report (replace <dash> with "-", requires xdebug)
-	
+
 	More information:
 	- http://www.phpunit.de/manual/current/en/textui.html
 	- http://doc.silverstripe.org/framework/en/topics/testing/#configuration
@@ -24,11 +24,11 @@
 		<directory>framework/tests</directory>
 		<directory>framework/admin/tests</directory>
 	</testsuite>
-	
+
 	<listeners>
-		<listener class="SS_TestListener" file="framework/dev/TestListener.php" />
+		<listener class="SilverStripe\Dev\SS_TestListener" file="framework/Dev/SS_TestListener.php" />
 	</listeners>
-	
+
 	<groups>
 		<exclude>
 			<group>sanitychecks</group>