Split tree Makefile into custom logic + Objects.mk
Some more messing with makefiles
More noodling with the make system - I think we'll roll out this