Add with_first_found condition, and remove duplicated configuration directories
Add handlers and clean up