split setup and prep

Change-Id: I5ab555d6a1686bcceeb50f99c9fadb28100ea10f