Move filter collection builder service to filter bundle

Fixes #124.