Refactor to standard Gem layout