unify code paths for New directory