Another update of structure (possibly final), Week-2 samples added