Move some Divs to Better Tags