n2 and org updates

updated n2 to latest version using nuget packages

first attempt at reorg