Fixes #1362 Also fixes some other bugs that impeded this from working.
Mostly moved classes that became node derivatives into the node/ folder.