Re-arranged the Solution structure.