Fixed the gadget import names and hierarchy