diff --git a/composer.json b/composer.json
index f5776ae..2827e96 100644
--- a/composer.json
+++ b/composer.json
@@ -53,20 +53,19 @@
     "nfreear/ou-media-player-test": "*; Remote integration tests.",
     "IET-OU/mediaelement-demo": "*; Demos for IET-OU enhancements & fixes to MediaElement.js",
 
-    "fancyguy/webroot-installer": "1.1.0",
     "wikimedia/composer-merge-plugin": "v1.0.0",
     "nfreear/composer-suggest": "^1.1"
   },
   "scripts": {
-    "test-psr2": [
+    "test": [
       "#echo $1",
       "#export F=application/$1 ;",
       "#composer validate #--no-interaction",
       "#parallel-lint application/*",
-      "phpcs --standard=PSR2 -n --encoding=utf-8 --extensions=php application/core/MY_Co*"
+      "phpcs --standard=./phpcs.xml -n --encoding=utf-8 --extensions=php application/core/*"
     ],
-    "test-oump": [
-      "phpcs --standard=./phpcs.xml -n --encoding=utf-8 --extensions=php application/core/MY_Co*"
+    "test-psr2": [
+      "phpcs --standard=PSR2 -n --encoding=utf-8 --extensions=php application/core/MY_Co*"
     ],
 
     "test-v": [
@@ -74,10 +73,10 @@
     ],
 
     "fix-psr2": [
-      "phpcbf --standard=PSR2 -n -l  --encoding=utf-8 --extensions=php application/core/MY_Contr*"
+      "phpcbf --standard=PSR2 -n -l  --encoding=utf-8 --extensions=php application/core/MY_Co*"
     ],
     "fix-oump": [
-      "phpcbf --standard=./phpcs.xml -n -l --encoding=utf-8 --extensions=php application/core/MY_Co*"
+      "phpcbf --standard=./phpcs.xml -n -l --encoding=utf-8 --extensions=php application/core/*"
     ]
   },
   "config": {
@@ -85,9 +84,6 @@
   },
   "extra": {
 
-    "webroot-dir": "application/engines/mediaelement-x",
-    "webroot-package": "johndyer/mediaelement",
-
     "installer-paths": {
       "./application/engines/mediaelement-x": [ "johndyer/mediaelement" ]
     },
@@ -104,8 +100,6 @@
       "https://github.com/IET-OU/ouplayer ../system/core/CodeIgniter.php#L36 - CI 2.1.3",
       "http://iet-embed-acct.open.ac.uk/docs/CREDITS.txt",
 
-      "TODO:  rm cache/ hooks/ logs/ migrations/ third_party/",
-
       "https://gist.github.com/nfreear/57262e040d49b2f212ec"
     ]
   }
diff --git a/phpcs.xml b/phpcs.xml
index e12e147..b4691d4 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0"?>
 <ruleset name="mediaplayer-open-ac-uk">
   <description>OU Media Player coding standard - PSR2, almost!</description>
+
   <!--
     Stay as close to PSR-2 as possible, but account for CodeIgniter conventions.
 
-    https://github.com/squizlabs/PHP_CodeSniffer ./Standards/PSR2/ruleset.xml
-    https://github.com/cakephp/cakephp-codesniffer ./CakePHP/ruleset.xml
     http://edorian.github.io/php-coding-standard-generator/#phpcs
   -->
 
   <exclude-pattern>\.git</exclude-pattern>
+  <exclude-pattern>/application/assets/</exclude-pattern>
+  <exclude-pattern>/application/cli/</exclude-pattern>
+  <exclude-pattern>/application/config/</exclude-pattern>
+  <exclude-pattern>/application/engines/</exclude-pattern>
   <exclude-pattern>/system/</exclude-pattern>
   <exclude-pattern>/vendor/</exclude-pattern>
   <exclude-pattern>*/*.html</exclude-pattern>
+  <exclude-pattern>*/*BAK*</exclude-pattern>
 
   <rule ref="PSR2">
     <exclude name="PSR2.Methods.MethodDeclaration"/>
@@ -20,9 +24,14 @@
   </rule>
 
   <rule ref="PSR1">
-  <exclude name="PSR1.Methods.CamelCapsMethodName"/>
-  <!--<exclude name="PSR1.Classes.ClassDeclaration"/><!-|- namespace -->
-  <exclude name="PSR1.Files.SideEffects"/>
+    <exclude name="PSR1.Methods.CamelCapsMethodName"/>
+
+    <!--
+      For the moment, don't require namespaces.
+    -->
+    <exclude name="PSR1.Classes.ClassDeclaration"/>
+
+    <!--<exclude name="PSR1.Files.SideEffects"/>-->
   </rule>
 
   <rule ref="Squiz.Classes">