re-org. Fancy up the makefile a bit