reorginizing pick delivery code
deleting old files
More testing and fixes for corner case problem with 2-opt code.
Merge branch 'vdev' into develop
Merge branch 'sdev' into develop