Reorg
Gemfile and Rakefile