Yet more refactoring of old OdiSvn