Work-in-progress

Fixed:
- Issue related to incorrect relative path for folders (folder name was
getting placed into the relative path).