Fix setup script for code reorg.