Removed duplicate files to conform to new directory structure.