moved around files and started naming models