Changed directory structure, updated Makefile.