moving more things around to fit heroku project tree format