Added full solution structure.