Moving along with separation of library and Node Manager