VPP-39 - refactoring of NSH into own folder