Osmnode refactor

@dgearhart @dnesbitt61 @kevinkreiser