Renovate Class Structure