Add Makefiles, cleanup