Update gemfile. Add dependencies and reorganize / annotate