Renamed namespaces and NuGet package + some clean up