renaming some files and functions