reorganized install/make files