How to commit changes if remote repository changed directory structure?

I have a lot of local changes to add, commit, and push. Right now our directory structure is 1/2/3. Another developer decided to move everything up one level, so used git move to move 3 to 2, and removed 3, so now the level is 1/2. However, locally, all of my changes are in 1/2/3.

I want to commit my changes and merge them into the new directory structure. How would I go about doing that?

Thanks!