Updated and added new makefiles