Arranging directory and updating yaml