new template "native" structure + fixes