Move some things around in the Setup package