Various continued

Separated organisations from clients file