Renamed Entity interface and file separation