Moved data structures to own folder