Restructured solution

Made solution view more structured and meanful