Updated some things as a result of the re-org.