Repo: Updating repo-structure.
Merge pull request #4 from ehelms/repo-structure

Repo - Updating repository structure and updating imports.