Manage addonsettings cleanup

Just a little bit of cleaning / restructuring :)