fix import problem, refactoring stage (2/2)