Complete restruct for heroku and travis ci