setup now uses the new directory semantics