Fixed the gadget import names and hierarchy
Merge pull request #902 from priand/playground2

Fixed the gadget import names and hierarchy