Refactor away from NuGet Architecture