Finish import refactoring