cleaning up makefile and reorganizing