master
8187443: Forest Consolidation: Move files to unified layout
8383920: Clean up calls to deprecated getStartPosition and getEndPosition methods