fixed imports in modules