Merge pull request #31 from Harvard-ATG/refactor/components

REQUEST REVIEW -- Refactor/components
Merge branch 'develop' into feature/exercise-component