Re-organize components into meaningful sections