Remove 1.x files and add 2.x files