Merge "Rename packages to match directory structure."