Restructuring the add-on. 

Nothing more than restructuring the add-on.