renaming some files to simplify