Makefile fixes

Moving the makefiles around and deleting unused files.