Simplify repository structure.