Made more logical and legible
Minor changes to Makefiles