Use lotus/model from official repo
Reorganize requires