Uve Code re-org