new gemfile, move files around