Refactored activities into activities package