Re-organize models and repositories