Moved filters into their own package