Restructure and introduce 2.1