More node/repo->device/folder renaming (fixes #4)