Componentize
Merge pull request #11 from timoxley/feature/componentize

Componentize