iReorganized Makefile.am