Restructure of Repository