Repo Structure: Updates to the latest repo structure and cleans code up.
Merge pull request #8 from ehelms/repo-structure

Repo Structure: Updates to the latest repo structure and cleans code up.