Massive restructuring with CodeKit