reorganize some tpls
merge with head
general structure of the theme