Refactoring of imports, dependencies and packages.