Student Directory refactor