some renames and basic DAO created