Refactored addon-manager structure