moka refactorings and first version of splitters