master
8187443: Forest Consolidation: Move files to unified layout
8279134: Fix Amazon copyright in various files