master
8187443: Forest Consolidation: Move files to unified layout
8189749: Devise strategy for making source level checks more uniform