Importing fixes, yaml location standardisation