Moved some things around
Reorganized some more, created stub for updating student model