Restruct Repair Services