Component Hierarchy

This project didn't really have a plan, so there is a flat hierarchy of Components since most of them were 'bolted on' so to speak.

It would be nice to re-evaluate the composition/hierarchy of React components and adjust to make the most sense.