Restructure Solution