Update yarn dir structure macros