Restructure the whole solutions Part 3