Renamed and edited makefiles.
Updated .gitignore to accept the renamed makefiles.
Added the renamed makefiles.