Osmway refactor

@kevinkreiser @dnesbitt61 @dgearhart