Package re-org and module renaming