Folder refactor
Updated nuget packages