Demo file and validator files renamed