Reorganize gem structure, fix gemspec