moved tool classes