Restructure - DSVC-162