Adding makefile, moving some stuff around