Add option to split by class/module + cleanup

Another possibility would be adding a command line argument to change the default split behavior. I'd generally rather avoid that, though, if we can come to a consensus.