Restructure html