Rename, add m directory