Refactor overlay hierarchy