[gatein-dev] Code reorganization