shuffle tools commands into separate module