Cleanup repo C - order in files