Move activities to .activity package