Move several classes to a tool package