Reorg'd Makefile so I can enable profiling options easily.