reorganized gem files and added Heroku gems