re-shuffle som code

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/compress/trunk@1572222 13f79535-47bb-0310-9956-ffa450edef68