restructure is nearly finished