Renamed client and service folders, completed add[node/link] code