Restructure HTML