Renaming and copying makefiles around
Removing old makefile