Reorganized gemfile
Reworded rspec tests, redid app structure

And updated Gemfile once again...