Refactoring order structure
Refactoring order structure