Rework the repository structure.