using makefile to install now
moving some files around