Server File handling changes and nuget tune up