Move DAOS to the respective package