continuing modularizing data structures