Move Filter and IPFilter around into new packages