Cleaned up ASF Makefile
Removed some extraneous includes
Organized project Makefiles for easier editing