reorganizing, making gemspec work