Rename handler classes
Rename handler classes over here
Stop abusing constructor function