Removed duplicate files. Many thanks to NetBeans for screwing up a simple rename.