restructure and more