even smaller fix
further splitting files, refined folding