Filescanner refactor