Refactoring of collab example code
78 files changed