Break out components to separate modules
Merge pull request #1 from songawee/new_tests

Break out components to separate modules