move BenefactorIdReader and ProjectIdReader back to metric package
Revert "move BenefactorIdReader and ProjectIdReader back to metric package"

This reverts commit 16c7d128b53873553e9e1093126b758cd0b2a2a0.
Revert 16c7d12..6def1d5

This rolls back to commit 16c7d128b53873553e9e1093126b758cd0b2a2a0.
change all tests that test the number of filters