Simplify, organize Makefile