Sounds correct. Please do so and test with the new and old repository structure.