Split up the m4 directories to make submodules yet more independent