Updating build to new superbuild format, fixing build/incorrect cmake formats