Split types into multiple files
Remove naming workarounds from single-file times