Contacts uses Organisation in Views

Also changing all feature test and routes