normalize branches. use whatever you what.
moved templates to its own folder.