Fix package paths to reference solution packages folder (they were inconsitent, and not resolving on a clean checkout and package restore)