Refactored imports
Merge pull request #9 from ltfschoen/develop

Refactored imports