Merged two temp dirs
Modified namespace