Rename directories to match packages.