refactor activities into separate package