Collapse ensure_dir_is_templated check
Refactor project template search