Refactor Components

[cjs8487]

There are several ways to reduce the number of components we have, both by combining them into files (rather than one per file) as well as changing components to take prop values to determine state, removing the need for individual components for everything. These changes will allow logic refactors to be applied more easily, as well as consolidate state, rather than track the same state in multiple locations, just in different ways