122 - Re-arrange hierarchy, align with production environment