Tax avoidance clampdown aims to raise extra £2bn by 2022