Moved unused files and Upgraded Makefile