Move to new gem structure
Merge branch 'new-gem-structure'