handle SwappedPair in separate class

Issue #499 resolved
Benjamin Cordes created an issue

No description provided.