Fixed makefiles to always find code and other makefiles correctly
Resolved merge conficts with upstream