restructure yml