Reorganization and cleanup of Gemfile and gemspec