Refactored structure
:Refactored structure