JZ: Rename common.pip to base.pip