restructure osmclient

No match.