reorganized CEGUI for consistency