Updates to layout

Rearranging the layout
Source Cleanup, add json

Added json representing plan structure