Major refactor of student models