Restructure complete