Refactor: Module names and module paths.