Update and rename some classes according to the meeting 11/28
Add new organization : torqueOrganization