restructure done