Move data structures to new directory struct/