Fix the repository structure