Restructure task activity (members & files)

This builds on #1209