Cleanup and refactor file names