File name changes and refactoring