Switch packages back under /solution to accommodate Qhode builds.