Refractor to tour do

@snova59 merge this in after you look over it, it is an effort to keep the folders in line and have a `Tour` data object.