Move model/entity to entity/ and model/ to operators/