Tool extracted into own repo