MBH: bug fixes, file renaming
MBH: keeping track dir tree