Refactored directory structure; Reconfigured make.m