Restructing the repository