Large scale refactor/rewrite of the AddonManager, adding cleaner separation between...