local changes for new filesystem &clean up
changes for new filesystem structure