update readme
move templates, some fixes
update readme