Enable package restore
Added more "parts".

Cleanup.