Removed testing code.
Restructured Makefile