reorganized Gemfile and specfile to fix minor errors