Solution restructure