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