Remove files from repo when removed
Refactoring models