4.0: Split some code in various tools