Preparation for Heroku PG, reorganize files