Rename file, code refactoring and customization