Some PEP and moved protein group sorting to own module