Reorganize files, update nuget test dependency, add namespaces.