Renaming some files and code clean up.