Improved code for moving migrated files in the store directory

Please exclude all property stores, like we talked about.