Update packages
Update nuspecs
Code cleanup