Fixed imports for new package stucture.
Merge pull request #4 from mcmtroffaes/fix-imports

Fixed imports for new package stucture.