Updated makefiles

Major reorganization of Makefiles as I wasn't happy with how long they were. I may reduce further in the future but for now this will be a major improvement.