Refactoring the package and module layout.