source xwiki refactoring