A good practice is don't move anything you're not modifying...It seems you have copied everything to your theme folder and only modifying some? Alot of developers do this and it is not a good practice.
So assuming you did not modify that file, then simply delete it from your theme folder and the plugin will default to the latest 2.0+ version. This is assuming you didn't modify it of course. Make a backup just in case.