Minor changes/updated directories

Updated directories and minor bug fix