Update import paths
Merge pull request #1 from VividCortex/import-paths

Update import paths