Refactoring: combined activities with existing messages API docs

Combined new activity stuff with existing messages documentation. This could still use some cleanup and fine-tuning.