Refactoring

(sorry)

-   Removed some unneeded files
-   Restructured filters - in most cases a custom Filter class is not needed,
-   Simplified config (untested)