STORM-44 - Refactoring changes for mergin stormagent with stormtower