Reorganized, cleaned up makefile