Change structure of CFMerge branch 'servlets' of https://source.jalview.org/git/prote...