modify paths and makefiles to get it building