S17 Merged

Merged Session17 subdirectories