Add makefiles, rename a file