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

This reverts commit 5ede04ad22ee9e982eaa64c68c29bc5ff871edfa.