Removed redundent function naming and Added all files functions