Revert "Minor changes with packages."

This reverts commit be8a7994e724ea823923f2c1fa3d76d62a333b08.
Revert "More build errors."

This reverts commit 84c1b8b157bdcba1f45027beeba2d39212057bcd.
Revert "Fixing Package errors"

This reverts commit 2df393dbc4b5c95a51703422de377c3b669b9c87.
Fixing build errors round 2.