Updates
- move templates to templates/\n- vim updates