Reorganize addon namespace