Makefile fixes and export
Removed old files