restructure changes