diff --git a/css/LeftAndMain_Subsites.css b/client/css/LeftAndMain_Subsites.css
similarity index 100%
rename from css/LeftAndMain_Subsites.css
rename to client/css/LeftAndMain_Subsites.css
diff --git a/javascript/LeftAndMain_Subsites.js b/client/javascript/LeftAndMain_Subsites.js
similarity index 100%
rename from javascript/LeftAndMain_Subsites.js
rename to client/javascript/LeftAndMain_Subsites.js
diff --git a/javascript/SubsitesTreeDropdownField.js b/client/javascript/SubsitesTreeDropdownField.js
similarity index 100%
rename from javascript/SubsitesTreeDropdownField.js
rename to client/javascript/SubsitesTreeDropdownField.js
diff --git a/javascript/VirtualPage_Subsites.js b/client/javascript/VirtualPage_Subsites.js
similarity index 100%
rename from javascript/VirtualPage_Subsites.js
rename to client/javascript/VirtualPage_Subsites.js
diff --git a/composer.json b/composer.json
index eeca0543..e524f919 100644
--- a/composer.json
+++ b/composer.json
@@ -38,8 +38,8 @@
             "dev-master": "2.x-dev"
         },
         "expose": [
-            "javascript",
-            "css"
+            "client/javascript",
+            "client/css"
         ]
     },
     "minimum-stability": "dev",
diff --git a/src/Extensions/LeftAndMainSubsites.php b/src/Extensions/LeftAndMainSubsites.php
index 877e30ed..ac473c9e 100644
--- a/src/Extensions/LeftAndMainSubsites.php
+++ b/src/Extensions/LeftAndMainSubsites.php
@@ -41,9 +41,9 @@ class LeftAndMainSubsites extends LeftAndMainExtension
 
     public function init()
     {
-        Requirements::css('silverstripe/subsites:css/LeftAndMain_Subsites.css');
-        Requirements::javascript('silverstripe/subsites:javascript/LeftAndMain_Subsites.js');
-        Requirements::javascript('silverstripe/subsites:javascript/VirtualPage_Subsites.js');
+        Requirements::css('silverstripe/subsites:client/css/LeftAndMain_Subsites.css');
+        Requirements::javascript('silverstripe/subsites:client/javascript/LeftAndMain_Subsites.js');
+        Requirements::javascript('silverstripe/subsites:client/javascript/VirtualPage_Subsites.js');
     }
 
     /**
@@ -150,7 +150,7 @@ public function ListSubsites()
             return false;
         }
 
-        Requirements::javascript('silverstripe/subsites:javascript/LeftAndMain_Subsites.js');
+        Requirements::javascript('silverstripe/subsites:client/javascript/LeftAndMain_Subsites.js');
 
         $output = ArrayList::create();
 
diff --git a/src/Forms/SubsitesTreeDropdownField.php b/src/Forms/SubsitesTreeDropdownField.php
index 4294306d..59c37c21 100644
--- a/src/Forms/SubsitesTreeDropdownField.php
+++ b/src/Forms/SubsitesTreeDropdownField.php
@@ -38,7 +38,7 @@ public function Field($properties = [])
     {
         $html = parent::Field($properties);
 
-        Requirements::javascript('silverstripe/subsites:javascript/SubsitesTreeDropdownField.js');
+        Requirements::javascript('silverstripe/subsites:client/javascript/SubsitesTreeDropdownField.js');
 
         return $html;
     }