re-organize files based on new repository structure