Consolidate effect.h classes