Cleaning and adding makefiles