Move CM stuff in the right place

If we're re-syncing before stuff, the CM setting up script would be useless