We should probably use separate packages for the two apps.