Simplify underlay directory structure.