Fixing new full path approach adde to suppport new folder structure