Updating structure for easier expansion.
Cleanup.
Updated to reflect new structure.
Fixups for new structure.