Remove file with wrong name
Add back BaseModel