reorganizing for install via makefile