rename some class and add dao class