Simplify overlays into subdirectories