Refactored code into folders