Major Overhaul

Overhaul to organization to allow easier viewing.