Revert "Makefile: Restructure for Greater Optimization"

This reverts commit aced40f468de5aa3b31b66cb016afa9632af1a91.