Both discovery & poll, producer & consumer, naming bugs fixed
Removed old files from previous factorings