Refactoring, change qualification of imports