Use correct import paths, closes #2