Restructuring repository...