Major Cleanup in structure of Solution