Change the tree stucture of the addon. Issue #1.