consolidated User, Tutor, Student, files into Users