cleaned up for tarball, need to organize everthing, makefile, etc..