Moved into correct filters package
Refactored problem 1 to be consistent with problems 2 & 3