new structure clean up mostly complete