Package browser refactor