Put data structures in their own file