renamed some files and renamed a functions