Update and rename Dao to Dao.java