Added CommonMakefiles, update Makefile