Removed duplicate files, fixed redirects