Updated directory structure and code changes associated