more restructuring, renamed some poly functions