Move some blocks from Network to Nodes+edges

Closes #35.