restructure scratch/ more