restructoring the repository