Move to simpler directory structure to allow cloning under a single cgutil directory.