Standardize import statements
Merge pull request #53 from kytrinyx/standardize-import

Standardize import statements