Split .htaccess file to appropriate areas of concern

.htaccess

@@ -3,14 +3,9 @@ Order Allow,Deny
 Deny from all
 </Files>
 
-# Old /draftX should go to root
-RedirectMatch 301 "^/draft\d[\/]{0,1}$" /
-
-# Serve up everything in dist/
 RewriteEngine On
-# But not letsencrypt challenge responses!
+
+# Not letsencrypt challenge responses!
 RewriteCond %{REQUEST_URI} !^/\.well-known
+# Serve up everything in dist/
 RewriteRule !^dist(/|$) dist%{REQUEST_URI} [L]
-
-ExpiresActive On
-ExpiresDefault "access plus 1 week"

www/.htaccess

@@ -0,0 +1,16 @@
+<Files .htaccess>
+Order Allow,Deny
+Deny from all
+</Files>
+
+RewriteEngine On
+
+# Assumes this directory is deployed at the *root* of the domain
+# We need this in case it's being served from a subdirectory (like dist/)
+# and the root .htaccess is locally rewriting to it.
+RewriteBase /
+# Old draftX should be stripped out
+RewriteRule "^draft\d[\/]{0,1}$"  ""  [R]
+
+ExpiresActive On
+ExpiresDefault "access plus 1 week"