Refactoring Code & Renaming files