Refactored the structure.