OK, didn't know about that, then let's keep the separate files.