templates directory structure changed