restructure and design