Rename of Classes, remove the 3D Affix
Remove the 2D codes, and set the 3D mode as default
Move files