sigh. Directory structure redo, Heroku complained too much