better dir and file names
function rename & useless function removed
change function name