some files renamed or removed, templates updated