Incorporated changes to files which enables the code to have a separate data structure for Solution and Steps. These changes were pulled from AudreyRishabh branch and merged into this branch
Added changes to add Solution and Steps

Added changes made by Audrey and Rishabh and incorporated those changes
from their branch to this branch