Renaming files to NVariant
Renaming folders to NVariant
Fixing namespaces