Move vnode macros to their own directories