moved logos to logos.h, cleaned up makefile