master
8187443: Forest Consolidation: Move files to unified layout
8237589: Fix copyright header formatting