Enabled NuGet Package Restore.

Moved/Renamed stuff around into logical categories.