-Nepomuk2 initial refactoring.