Repository restructuring