Re-structured the makefile heirarchy.