correct imports from refactoring (fix #151)