Rearrange order of workflow; fixes #175, needs to be updated in DB
Rearrange surveys, tidy up, fixes #175 #176