Removing duplicate files, renaming things to get automake to stop yelling at me