move data structures to own dir