Update new2dir to support multiple architectures