Refactored dao & descriptor packages