Simplify folder structure (remove duplicate files)