Restructure web part