Update to "Trimsite2"

Basically, a reorganisation of step8 to turn it into Trimsite2