Refactor + File Renaming