Fix #4 - Leverage new gem structure

This pull request resolved #4 in tandem with the PRs in other related repos. All need to be merged at once.