solution structure refactoring
solution structure refactoring