Moving setup tasks, fixing single upload dir bug.