Rework Makefile to better classify files.