reorganize activities into packages