File extension refactor