Refactor multisolr files