Completed Makefile
cleaned up the project folder structure