168ce44 Fix #21822 - Restructure GlassFish source code (#21828)