Move those filters, work it, PSR-4
Fix class names