move Connection and ActivityItem in to their own files