Restructure markup