restructure and prop symbols