Add makefile and move some files around