refactor activities package