Refactoring and creating NuGet package