Rename, restructure np-scripts