Merge "change directory name" into nyc-dev