Updated directory structure, adjusted Makefile