Finished first pass of digitizeroads refactoring