Remove duplicate files as part of restructuring.