Some bug fix so the module get installed

Wrong hook calls deleted
class names fixed