addon reestructure