* Restructured some package installs.