User Dao & Package Refactoring