Restructured and merged Transform and Html