Move ForceCarrier to base entity package