Move the non-roles static_base and static_srvdir to static/<foo>