Updated makefile. It now functions correctly
Updated file structure