Refactor project model
Refactor issue model