libosmscout: rearranged a couple of files