Reorganization of src/Makefile.am