Move the filters into package