correct imports from refactoring (fix #151)
correct imports from refactoring (fix #151)