remove m.h.xml component and move the class to the generic helper folder