Updating build to new superbuild format