Module renames and package refactoring.
More stubs