Add option to split by class/module + cleanup