Updated setup script for the re-org.
Merge branch 'prep-0.6' into develop