Updated makefiles in parts1-4