Moved m4 stuff to m4 dir to match how we're doing it in the other projects.