Prepare for Restructure
Change design