master
8378918: Remove AppContext from some DnD classes
8187443: Forest Consolidation: Move files to unified layout