Updated the makefiles accordingly