Develop refactoring See merge request !1
Putting it in a separate repository to share it outside BSC.