Refactored structure to work with npm and heroku.