DAO refactoring
Re-packaging.