Added some missing files and cleaned up a makefile
Removed backup makefile