Separate Delusion and Filter classes.
Fix addDelusionInterface() method.
Merge branch 'feature/filter' into develop