Improve NS use in Generator
Allow project to be packaged