Filters/Sort/Scopes WIP + change package name