Refactored solution structure
doc changes