Updated where src files go, and updated Makefile to allow debug.