Updated directory structure and added heirarchical makefile