Restructure beginning.
Finish restructure.