Refactoring model
Update unit tests
Move shiro implementation in es-dms-service