code reorg, move flow stuff to OLD; add new node-gateway