use new directory structure
fix yaml