Move package to allow build w/o another package