Modified directory structure and makefile