Separated movement and location in models.