master
8187443: Forest Consolidation: Move files to unified layout
8362632: Improve HttpServer Request handling