Those are the first round of changes for the clean up of SlapTool in preparation for an new API.
/cc @romain @tomo @cedric.leninivin
This will create a new commit in order to revert the existing changes.
