Johannes Saurer Architekt completes conscientious expansion and conversion of Thun factory building