Restructure Teacher -> Organisation relatioship, update views