Change packages structure for generic-dao.