Refactor for WEBROOT changes to keep data/web separate