Fixed branch re-organization compilation issues, Makefile for compilation