moving filter classes and tests to filter package