Updated makefile for new directory structure.
Updated testing script.
Modified makefile. (Broken)