Add contact model. Rename wrongly named files