Reorganized Makefile

Adjusted the order of operations in /src/Makefile