Move ImageryProvider icons into their own sub-folder, also remove two unused files.