Move variable to where it's used
Add support for YAML import files as an alternative to symlinks