Rearranging fileSets so your custom files do not get clobbered by default ones. Also removing unneeded filtering.