Restructure the repository