Fixed and standardized makefiles