Some refactoring around svn classes