Swtich from tools to helpers package