1) Changed NodeId to to include a machine hash.
2) Moving around packages.