Cleanup, and add nuget packages