removed discovery dependencies in build
update Makefiles to put all objects in Builds