Refactoring modules and subpackages.