more refactoring
refactoring, NuGet starting To work