Significant refactoring of module names for clarity and consistency.