renamed Entity related files