AVALANCHE: Trip: replace namespace with class.