restructure divs for new layout