Begin tidying stuff into tools/