massive restructure, pulling things out