fixed issues related to new directory structure