restructuring into separate files; intrusive lists and sets 1.55