Rearrange Makefile.am