BHV-6022-fix: Change remapping files/folders to work fine

Enyo-DCO-1.1-Signed-off-by Junil Kim <logyourself@gmail.com>
Merge pull request #861 from enyojs/BHV-6022-Fix

BHV-6022-fix: Change remapping files/folders to work fine