Re-org and integrate zer cleanup