Merge "Centralize nsd associated files"