refactoring, preparing addons for marketplace support