make folders and better Makefile