Update 6, 7, 7a

Change directories on 7a
Add in new Solanum trees on 7
Re-add working save for niche comparisons on 6