Restructure HTML
3.0.7-Release