Added root makefile and added path inheritance.
Removed optional code using ifdef checks