Refactoring code and renaming files