Thompsons opts for corporate structure