simplify templates
fix paths