Initial commit for makefile
More cleanup