FEATURE: Major refactor to transform structure
Merge pull request #12 from camspiers/refactor

FEATURE: Major refactor to transform structure