re-org folder structure for heroku deploy