Made html.tpl working with new standards.
Moving items into sub folder.