Org changes

I tidied up the user list