master
8187443: Forest Consolidation: Move files to unified layout
8367005: ImageReader refactor caused performance regressions for startup and footprint