restructure some more