Moved data structures to their own directory/namespace.