finish refactoring of imports