Updates Gemfile
Reorganises spec files