Restructured problem layout