restruct widgets model class