rename some files and add some 2D code