Update to 1.7.2, reorganize workspace