Refactor main/models
More refactoring
Refactored admin