move templates into templates dir
fix conflict