Unified the Makefiles