split arithmetic and rename ap_util
renamed header