SOlution structure refactored